* lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE): Fix error

in the sed script that mangles the awk script: delete up to the
first exclamation mark only.
* tests/torture.at (Substitute and define special characters):
Test '!' too.

diff --git a/ChangeLog b/ChangeLog
index 155f2054eb7a70ef43987b5e83b09b5486284a33..aa45cda002bfe8aabde06e08249040462f85aec1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-11-27  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE): Fix error
+       in the sed script that mangles the awk script: delete up to the
+       first exclamation mark only.
+       * tests/torture.at (Substitute and define special characters):
+       Test '!' too.
+
 2006-11-26  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Rewrite config files generation: avoid quadratic growth in

diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index b7db761724b60d6b98b05949c3525ecbe7fe5ed5..318544b1cf18c82745cb8bd6122ea3d239ff8d66 100644 (file)
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -446,7 +446,7 @@ N; b line
 h
 s/^/S["/; s/!.*/"]=/; p
 g
-s/^.*!//
+s/^[^!]*!//
 :more
 t more
 h

diff --git a/tests/torture.at b/tests/torture.at
index 89bb703782346279b3c4ff15258fe960646ad795..ebe5345f707dadf3bf80a09bb8ea979bd42ee315 100644 (file)
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -620,7 +620,7 @@ AT_DATA([File],
 ])
 
 AT_CONFIGURE_AC(
-[[foo="AS@&t@_ESCAPE([[X*'[]+ ",& &`\($foo \& \\& \\\& \\\\& \ \\ \\\]])"
+[[foo="AS@&t@_ESCAPE([[X*'[]+ ",& &`\($foo \& \\& \\\& \\\\& \ \\ \\\ !]])"
 bar="@foo@ @baz@"
 baz=bla
 AC_SUBST([foo])
@@ -628,13 +628,13 @@ AC_SUBST([bar])
 AC_SUBST([baz])
 file=File
 AC_SUBST_FILE([file])
-AC_DEFINE([foo], [[X*'[]+ ",& &`\($foo]], [Awful value.])
+AC_DEFINE([foo], [[X*'[]+ ",& &`\($foo !]], [Awful value.])
 AC_CONFIG_FILES([Foo])]])
 
 AT_CHECK_AUTOCONF
 AT_CHECK_AUTOHEADER
 AT_CHECK_CONFIGURE
-AT_CHECK([cat Foo], 0, [[X*'[]+ ",& &`\($foo \& \\& \\\& \\\\& \ \\ \\\
+AT_CHECK([cat Foo], 0, [[X*'[]+ ",& &`\($foo \& \\& \\\& \\\\& \ \\ \\\ !
 @foo@ @baz@@notsubsted@bla stray @ and more@@bla
 abc@foo@ @baz@baz@baz
 abc@foo@ @baz@blabaz
@@ -647,7 +647,7 @@ abc@bar blabla
 X@file@
 @file@X
 ]])
-AT_CHECK_DEFINES([[#define foo X*'[]+ ",& &`\($foo
+AT_CHECK_DEFINES([[#define foo X*'[]+ ",& &`\($foo !
 ]])
 AT_CLEANUP