(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 5a3293e89e47e390e45ca8e3a67cf85c7b7840be..1bb983d57ad4c71b39d35a7efafa1fab0f14dc27 100644 (file)
--- 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 5a3293e89e47e390e45ca8e3a67cf85c7b7840be..1bb983d57ad4c71b39d35a7efafa1fab0f14dc27 100644 (file)
--- 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