Fix build with Autoconf 2.64

(cherry picked from commit 40911543dc81a21b7a23a8aceb20b2ad5304c637)

diff --git a/configure.in b/configure.in
index b067305f9dcf38c807099c986524dd54bd279cec..3e4286d767e0632cdcb8984208db543fad90ad6b 100644 (file)
--- 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 37bf7fe34f9f20451db7a37beddadff098359541..3786968be37961ffde0fdf15a9a6aa21b4dd50ab 100644 (file)
--- 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)