From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 20 Jul 2020 22:10:33 +0000 (-0700)
Subject: Don’t assume plain ‘make’ in C unit tests
X-Git-Tag: v2.69c~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96f0001bcda3ba9bed7eb13257842e556dbc4695;p=thirdparty%2Fautoconf.git

Don’t assume plain ‘make’ in C unit tests

Problem reported by Bruno Haible in:
https://savannah.gnu.org/support/?110273#comment6
* lib/autoconf/general.m4 (_AC_ARG_VAR_VALIDATE):
* tests/autotest.at (C unit tests, C unit tests (EXEEXT)):
Prefer ‘${MAKE-make}’ to ‘make’ in shell code.
---

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index e725d88c..8436d8c3 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1650,7 +1650,8 @@ done
 if $ac_cache_corrupted; then
   AS_MESSAGE([error: in `$ac_pwd':], 2)
   AS_MESSAGE([error: changes in the environment can compromise the build], 2)
-  AS_ERROR([run `make distclean' and/or `rm $cache_file' and start over])
+  AS_ERROR([run `${MAKE-make} distclean' and/or `rm $cache_file'
+	    and start over])
 fi])dnl
 ])# _AC_ARG_VAR_VALIDATE
 
diff --git a/tests/autotest.at b/tests/autotest.at
index 7d09ae37..d30e3df4 100644
--- a/tests/autotest.at
+++ b/tests/autotest.at
@@ -1935,7 +1935,7 @@ rm t/atconfig
 AT_CHECK_AUTOCONF
 AT_CHECK_CONFIGURE
 AT_CHECK([grep '^EXEEXT='\''.*'\' t/atconfig], [], [ignore])
-AT_CHECK([make], [], [ignore])
+AT_CHECK([${MAKE-make}], [], [ignore])
 AT_CHECK([cd t && $CONFIG_SHELL ./suite], [], [ignore])
 AT_CHECK([grep 1.*successful t/suite.log], [], [ignore])
 AT_CLEANUP
@@ -1996,7 +1996,7 @@ rm t/atconfig
 AT_CHECK_AUTOCONF
 AT_CHECK_CONFIGURE
 AT_CHECK([grep '^EXEEXT='\''.*'\' t/atconfig], [], [ignore])
-AT_CHECK([make], [], [ignore])
+AT_CHECK([${MAKE-make}], [], [ignore])
 AT_CHECK([cd t && $CONFIG_SHELL ./suite], [], [ignore])
 AT_CHECK([grep 1.*successful t/suite.log], [], [ignore])
 AT_CLEANUP