From: Patrick McCarty <pnorcks@gmail.com>
Date: Thu, 6 Aug 2009 03:49:52 +0000 (-0700)
Subject: Fix build with Autoconf 2.64
X-Git-Tag: release/2.12.3-1~9
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=61dbbcfb1c032a4c26bb9561b727ec72b967d817;hp=2459c66ea8366f6541be25728973975ee0bc4d62;p=lilypond.git

Fix build with Autoconf 2.64
(cherry picked from commit 40911543dc81a21b7a23a8aceb20b2ad5304c637)
---

diff --git a/configure.in b/configure.in
index b067305f9d..3e4286d767 100644
--- a/configure.in
+++ b/configure.in
@@ -11,6 +11,9 @@ AC_CONFIG_AUX_DIR([stepmake/bin])
 # For stepmake package:
 # AC_CONFIG_AUX_DIR(bin)
 
+# must expand this at top-level for autoconf>=2.64
+AC_PROG_CC
+
 
 STEPMAKE_INIT
 
diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 37bf7fe34f..3786968be3 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -205,7 +205,6 @@ AC_DEFUN(STEPMAKE_COMPILE, [
 	OPTIMIZE="$OPTIMIZE -g"
     fi
  
-    AC_PROG_CC
     STEPMAKE_OPTIONAL_REQUIRED(CC, cc, $1)
     LD='$(CC)'
     AC_SUBST(LD)