* lib/autoconf/programs.m4 (AC_PROG_MAKE_SET): Use and display

`$(MAKE)' instead of '${MAKE}' to emphasize that we refer to the
Make variable, not a shell variable.
Suggested by Bruno Haible.

diff --git a/ChangeLog b/ChangeLog
index 2559b55088c077575a70eccdc3616b75826125bf..3a97caa57f2feb5f71936d77c17589c3bce2fd18 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-10-31  Akim Demaille  <akim@epita.fr>
+
+       * lib/autoconf/programs.m4 (AC_PROG_MAKE_SET): Use and display
+       `$(MAKE)' instead of '${MAKE}' to emphasize that we refer to the
+       Make variable, not a shell variable.
+       Suggested by Bruno Haible.
+
 2002-10-31  Akim Demaille  <akim@epita.fr>
 
        * bin/autom4te.in (load_configuration): Reject #args out of any

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 8d970dd41bb66be8618229dac8681277337a9cdc..e28d628d1c2918b8b6070cef84e8009b342ce2b9 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -1688,9 +1688,10 @@ following macro allows you to use it even with those versions.
 @defmac AC_PROG_MAKE_SET
 @acindex PROG_MAKE_SET
 @ovindex SET_MAKE
-If @command{make} predefines the variable @code{MAKE}, define output
-variable @code{SET_MAKE} to be empty.  Otherwise, define @code{SET_MAKE}
-to contain @samp{MAKE=make}.  Calls @code{AC_SUBST} for @code{SET_MAKE}.
+If @command{make} predefines the Make variable @code{MAKE}, define
+output variable @code{SET_MAKE} to be empty.  Otherwise, define
+@code{SET_MAKE} to contain @samp{MAKE=make}.  Calls @code{AC_SUBST} for
+@code{SET_MAKE}.
 @end defmac
 
 If you use this macro, place a line like this in each @file{Makefile.in}

diff --git a/lib/autoconf/programs.m4 b/lib/autoconf/programs.m4
index 95364c9d10d830400aa9b2453ba266f19de38e74..230ed6f14eefb89433a728159d1203d77b532829 100644 (file)
--- a/lib/autoconf/programs.m4
+++ b/lib/autoconf/programs.m4
@@ -457,12 +457,12 @@ fi
 AN_MAKEVAR([MAKE], [AC_PROG_MAKE_SET])
 AN_PROGRAM([make], [AC_PROG_MAKE_SET])
 AC_DEFUN([AC_PROG_MAKE_SET],
-[AC_MSG_CHECKING([whether ${MAKE-make} sets \${MAKE}])
+[AC_MSG_CHECKING([whether ${MAKE-make} sets \$(MAKE)])
 set dummy ${MAKE-make}; ac_make=`echo "$[2]" | sed 'y,./+-,__p_,'`
 AC_CACHE_VAL(ac_cv_prog_make_${ac_make}_set,
 [cat >conftest.make <<\_ACEOF
 all:
-       @echo 'ac_maketemp="${MAKE}"'
+       @echo 'ac_maketemp="$(MAKE)"'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
 eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`