From: David MacKenzie <djm@djmnet.org>
Date: Mon, 27 Mar 1995 23:24:01 +0000 (+0000)
Subject: (AC_OUTPUT): Add quotes around the echo arguments
X-Git-Tag: fsf-origin~294
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0c29464c38d9807182dcf4fbc81122ac0b08d98;p=thirdparty%2Fautoconf.git

(AC_OUTPUT): Add quotes around the echo arguments
	in the trap, so backslashes aren't required for multiline input.
	From G.Wilford@ee.surrey.ac.uk.
	Also use the sed trick when not using a config header file.
---

diff --git a/acgeneral.m4 b/acgeneral.m4
index 5a3293e89..1bb983d57 100644
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -1665,11 +1665,11 @@ ac_given_srcdir=$srcdir
 ifdef([AC_PROVIDE_AC_PROG_INSTALL], [ac_given_INSTALL="$INSTALL"
 ])dnl
 
-ifdef([AC_LIST_HEADER],
-[changequote({,})
-trap 'rm -fr `echo $1 AC_LIST_HEADER | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-changequote(,)],
-[trap 'rm -f $1; exit 1' 1 2 15])
+changequote(<<, >>)dnl
+ifdef(<<AC_LIST_HEADER>>,
+<<trap 'rm -fr `echo "$1 AC_LIST_HEADER" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15>>,
+<<trap 'rm -fr `echo "$1" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15>>)
+changequote([, ])dnl
 
 AC_OUTPUT_FILES($1)
 ifdef([AC_LIST_HEADER], [AC_OUTPUT_HEADER(AC_LIST_HEADER)])dnl
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 5a3293e89..1bb983d57 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1665,11 +1665,11 @@ ac_given_srcdir=$srcdir
 ifdef([AC_PROVIDE_AC_PROG_INSTALL], [ac_given_INSTALL="$INSTALL"
 ])dnl
 
-ifdef([AC_LIST_HEADER],
-[changequote({,})
-trap 'rm -fr `echo $1 AC_LIST_HEADER | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-changequote(,)],
-[trap 'rm -f $1; exit 1' 1 2 15])
+changequote(<<, >>)dnl
+ifdef(<<AC_LIST_HEADER>>,
+<<trap 'rm -fr `echo "$1 AC_LIST_HEADER" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15>>,
+<<trap 'rm -fr `echo "$1" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15>>)
+changequote([, ])dnl
 
 AC_OUTPUT_FILES($1)
 ifdef([AC_LIST_HEADER], [AC_OUTPUT_HEADER(AC_LIST_HEADER)])dnl