From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 6 Aug 2024 06:09:58 +0000 (-0700)
Subject: Support more special chars in $(LIBDIR) etc
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d675dd3451be6b25b881ac8b6e568728126bc077;p=thirdparty%2Fautoconf.git

Support more special chars in $(LIBDIR) etc

* lib/autoconf/libs.m4 (_AC_PATH_X_XMKMF):
* lib/autoconf/programs.m4 (AC_PROG_MAKE_SET):
Allow more special characters in ‘make’ macros like LIBDIR and MAKE.
---

diff --git a/lib/autoconf/libs.m4 b/lib/autoconf/libs.m4
index 924d82d4d..20daf8dd4 100644
--- a/lib/autoconf/libs.m4
+++ b/lib/autoconf/libs.m4
@@ -170,11 +170,11 @@ if mkdir conftest.dir; then
   cd conftest.dir
   cat >Imakefile <<'_ACEOF'
 incroot:
-	@echo incroot='${INCROOT}'
+	@printf '%s\n' incroot='${INCROOT}'
 usrlibdir:
-	@echo usrlibdir='${USRLIBDIR}'
+	@printf '%s\n' usrlibdir='${USRLIBDIR}'
 libdir:
-	@echo libdir='${LIBDIR}'
+	@printf '%s\n' libdir='${LIBDIR}'
 _ACEOF
   if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
     # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
diff --git a/lib/autoconf/programs.m4 b/lib/autoconf/programs.m4
index 24a4677cb..9e415f333 100644
--- a/lib/autoconf/programs.m4
+++ b/lib/autoconf/programs.m4
@@ -936,7 +936,7 @@ AC_CACHE_VAL(ac_cv_prog_make_${ac_make}_set,
 [cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
+	@printf '%s\n' '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in