Properly quote AC_PREREQ during autoupdate.

* lib/autoconf/general.m4 (AC_PREREQ): Follow consistent quoting
style for AC_PREREQ.
* tests/tools.at (autoupdating AC_PREREQ): Update expected
results.
Reported by NightStrike.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index fac7c04247018f5ce73b1f9ff053955b3164a0d3..9c626346cb075a2a9ac5d26a5a6d0af4375450d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-06-07  Eric Blake  <eblake@redhat.com>
+
+       Properly quote AC_PREREQ during autoupdate.
+       * lib/autoconf/general.m4 (AC_PREREQ): Follow consistent quoting
+       style for AC_PREREQ.
+       * tests/tools.at (autoupdating AC_PREREQ): Update expected
+       results.
+       Reported by NightStrike.
+
 2010-06-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Documentation and tests for the AC_CHECK_DECL change.

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 762a56cbda395a57c64708c1fe33d63090d47794..f73673e4a20d6b300f5c64478be4309e3d4e3884 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -298,7 +298,7 @@ m4_define([AC_REVISION],
 # Autoconf, which is certainly not what the user intended.
 AU_DEFUN([AC_PREREQ],
 [m4_version_prereq([$1])[]dnl
-[AC_PREREQ(]]m4_defn([m4_PACKAGE_VERSION])[[)]])
+[AC_PREREQ(]]m4_dquote(m4_dquote(m4_defn([m4_PACKAGE_VERSION])))[[)]])
 
 
 # AC_PREREQ(VERSION)

diff --git a/tests/tools.at b/tests/tools.at
index 05e88c9c7ca13e8e7c23ee34a1316ec501946db7..167d68a81417018cc93834d53ffa1e63d5e61d1b 100644 (file)
--- a/tests/tools.at
+++ b/tests/tools.at
@@ -860,7 +860,7 @@ AT_SETUP([autoupdating AC_PREREQ])
 # Produce `AC_PREREQ(<AUTOUPDATE VERSION>)'.
 AT_CHECK([autoupdate --version | sed 's/.*) //;q'], 0, [stdout])
 autoupdate_version=`cat stdout`
-echo "AC_PREREQ($autoupdate_version)" >expout
+[echo "AC_PREREQ([$autoupdate_version])" >expout]
 
 AT_CHECK([echo "AC_PREREQ(1.0)" | autoupdate -],
         0, [expout], [])