From d675dd3451be6b25b881ac8b6e568728126bc077 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 5 Aug 2024 23:09:58 -0700
Subject: [PATCH] Support more special chars in $(LIBDIR) etc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 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.
---
 lib/autoconf/libs.m4     | 6 +++---
 lib/autoconf/programs.m4 | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/autoconf/libs.m4 b/lib/autoconf/libs.m4
index 924d82d4..20daf8dd 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 24a4677c..9e415f33 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