* 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 <[email protected]> --- Wow - I've really been delinquent on my autoconf patch queue. I've finally tested this fix for an issue raised in February. http://lists.gnu.org/archive/html/autoconf/2010-02/msg00079.html ChangeLog | 9 +++++++++ lib/autoconf/general.m4 | 2 +- tests/tools.at | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fac7c04..9c62634 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2010-06-07 Eric Blake <[email protected]> + + 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 <[email protected]> Documentation and tests for the AC_CHECK_DECL change. diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index 762a56c..f73673e 100644 --- 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 05e88c9..167d68a 100644 --- 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], []) -- 1.7.0.1
