[Automake-commit] [SCM] GNU Automake branch, branch-1-10, updated. Release-1-10-1-19-g9650b64

[Eric Blake]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=9650b648899f6b9c94528e034ae1d91f564772a0

The branch, branch-1-10 has been updated
       via  9650b648899f6b9c94528e034ae1d91f564772a0 (commit)
      from  6322e381eea63a237319f51344a3ef5fbe25974f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9650b648899f6b9c94528e034ae1d91f564772a0
Author: Eric Blake <address@hidden>
Date:   Thu Apr 10 09:51:23 2008 -0600

    AC_AUTOCONF_VERSION can inadvertently expand to a macro name.
    
    * m4/amversion.in (AM_SET_CURRENT_AUTOMAKE_VERSION): Use proper
    m4 quoting.
    * aclocal.in (write_aclocal): Likewise.
    * tests/missing6.test: New test.
    * tests/Makefile.am (TESTS): Run it.
    * tests/missing4.test: Adjust.
    
    Signed-off-by: Eric Blake <address@hidden>
    (cherry picked from commit 680877cce6a85e0a55a7659048c0431109f964b7)

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                          |   10 ++++++++
 aclocal.in                         |    2 +-
 aclocal.m4                         |    2 +-
 m4/amversion.in                    |    4 +-
 m4/amversion.m4                    |    4 +-
 tests/Makefile.am                  |    1 +
 tests/Makefile.in                  |    1 +
 tests/missing4.test                |    4 +-
 tests/{man3.test => missing6.test} |   43 +++++++++++++++++++++---------------
 9 files changed, 45 insertions(+), 26 deletions(-)
 copy tests/{man3.test => missing6.test} (54%)

diff --git a/ChangeLog b/ChangeLog
index 382d83a..78c2d51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-04-10  Eric Blake  <address@hidden>
+
+       AC_AUTOCONF_VERSION can inadvertently expand to a macro name.
+       * m4/amversion.in (AM_SET_CURRENT_AUTOMAKE_VERSION): Use proper
+       m4 quoting.
+       * aclocal.in (write_aclocal): Likewise.
+       * tests/missing6.test: New test.
+       * tests/Makefile.am (TESTS): Run it.
+       * tests/missing4.test: Adjust.
+
 2008-03-20  Ralf Wildenhues  <address@hidden>
 
        * lib/texinfo.tex: Sync from upstream.
diff --git a/aclocal.in b/aclocal.in
index b95b76b..e9d0476 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -797,7 +797,7 @@ sub write_aclocal ($@)
       # the file in the diagnostic anyway.
       $output = "m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [$ac_version],,
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [$ac_version],,
 [m4_warning([this file was generated for autoconf $ac_version.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
diff --git a/aclocal.m4 b/aclocal.m4
index 44c8caf..4b6da51 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,7 +13,7 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.61],,
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.61],,
 [m4_warning([this file was generated for autoconf 2.61.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
diff --git a/m4/amversion.in b/m4/amversion.in
index ab57590..40a9ed4 100644
--- a/m4/amversion.in
+++ b/m4/amversion.in
@@ -1,6 +1,6 @@
 ##                                                          -*- Autoconf -*-
 ## @configure_input@
-# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, 
Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -34,4 +34,4 @@ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
 [AM_AUTOMAKE_VERSION(address@hidden@])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index d392633..f2887f2 100644
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@ -1,6 +1,6 @@
 ##                                                          -*- Autoconf -*-
 ## Generated from amversion.in; do not edit by hand.
-# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, 
Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -34,4 +34,4 @@ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
 [AM_AUTOMAKE_VERSION([1.10.1a])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9db9bb3..a2fd0dd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -374,6 +374,7 @@ missing2.test \
 missing3.test \
 missing4.test \
 missing5.test \
+missing6.test \
 mkinstall.test \
 mkinst2.test \
 mkinst3.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 91635cb..01e42df 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -506,6 +506,7 @@ missing2.test \
 missing3.test \
 missing4.test \
 missing5.test \
+missing6.test \
 mkinstall.test \
 mkinst2.test \
 mkinst3.test \
diff --git a/tests/missing4.test b/tests/missing4.test
index e312067..a6c4d13 100755
--- a/tests/missing4.test
+++ b/tests/missing4.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2006, 2007  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2007, 2008  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -35,7 +35,7 @@ $AUTOMAKE
 ./configure
 $MAKE
 
-sed '1,20 s/AC_AUTOCONF_VERSION,/&9999/' < aclocal.m4 > aclocal.tmp
+sed '1,20 s/m4_defn(\[AC_AUTOCONF_VERSION\]),/9999,/' < aclocal.m4 > 
aclocal.tmp
 cmp aclocal.m4 aclocal.tmp && exit 1
 
 mv aclocal.tmp aclocal.m4
diff --git a/tests/man3.test b/tests/missing6.test
similarity index 54%
copy from tests/man3.test
copy to tests/missing6.test
index fe9394d..56c6047 100755
--- a/tests/man3.test
+++ b/tests/missing6.test
@@ -14,31 +14,38 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# PR 516: Prefer generated manpages to distributed ones.
+# Make sure autoconf version checks in aclocal.m4 are robust.
 
 . ./defs || exit 1
 
 set -e
 
-cat > Makefile.am << 'END'
-dist_man_MANS = foo.1
-installcheck-local:
-       grep bar "$(mandir)/man1/foo.1"
-END
+{
+  echo 'm4_define([AC_AUTOCONF_VERSION], [9999a])'
+  echo 'm4_define([b], [oops])'
+  cat configure.in
+  echo AC_OUTPUT
+} >configure.ac
+rm configure.in
 
-cat >>configure.in <<'END'
-: ${foo=foo}
-AC_SUBST([foo])
-AC_CONFIG_FILES([foo.1])
-AC_OUTPUT
-END
-
-cat > foo.1.in <<'END'
address@hidden@
-END
+touch Makefile.am
 
 $ACLOCAL
+$AUTOCONF 2>stderr
+grep 'You have another version of autoconf' stderr
+grep 'aclocal.m4:.*this file was generated for' stderr
 $AUTOMAKE
-$AUTOCONF
 ./configure
-DISTCHECK_CONFIGURE_FLAGS=foo=bar $MAKE -e distcheck
+$MAKE
+
+sed 's/\[b\]/[a]/' < configure.ac > configure.tmp
+cmp configure.ac configure.tmp && exit 1
+
+mv configure.tmp configure.ac
+
+$MAKE 2>stderr
+cat stderr
+grep 'You have another version of autoconf' stderr
+grep 'aclocal.m4:.*this file was generated for autoconf 9999a' stderr
+
+:


hooks/post-receive
--
GNU Automake