[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, master, updated. Release-1-
|
From: |
Eric Blake |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. Release-1-10-145-gced7549 |
|
Date: |
Thu, 10 Apr 2008 23:13:58 +0000 |
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=ced754971f39126c68dcce40055a1f47d4c6fd14
The branch, master has been updated
via ced754971f39126c68dcce40055a1f47d4c6fd14 (commit)
via 680877cce6a85e0a55a7659048c0431109f964b7 (commit)
from e5c291c5537245a0c1dadc16f29599cdac7e8107 (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 ced754971f39126c68dcce40055a1f47d4c6fd14
Author: Eric Blake <address@hidden>
Date: Thu Apr 10 16:47:55 2008 -0600
Prefer a released version of autoconf.
* NEWS: Bump requirement to autoconf 2.62.
* m4/init.m4 (AM_INIT_AUTOMAKE): Likewise.
* configure.ac: Likewise.
(AC_PREREQ): Remove check, done by AM_INIT_AUTOMAKE instead.
Signed-off-by: Eric Blake <address@hidden>
commit 680877cce6a85e0a55a7659048c0431109f964b7
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>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 16 +++++++++++
NEWS | 2 +-
aclocal.in | 2 +-
aclocal.m4 | 4 +-
configure | 45 ++++++++++++++++++++-----------
configure.ac | 4 +--
m4/amversion.in | 4 +-
m4/amversion.m4 | 4 +-
m4/init.m4 | 26 +++++++++---------
tests/Makefile.am | 1 +
tests/Makefile.in | 1 +
tests/missing4.test | 4 +-
tests/{missing4.test => missing6.test} | 30 +++++++++++----------
13 files changed, 87 insertions(+), 56 deletions(-)
copy tests/{missing4.test => missing6.test} (57%)
diff --git a/ChangeLog b/ChangeLog
index 2ac33db..e134e4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2008-04-10 Eric Blake <address@hidden>
+
+ Prefer a released version of autoconf.
+ * NEWS: Bump requirement to autoconf 2.62.
+ * m4/init.m4 (AM_INIT_AUTOMAKE): Likewise.
+ * configure.ac: Likewise.
+ (AC_PREREQ): Remove check, done by AM_INIT_AUTOMAKE instead.
+
+ 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-04-02 Eric Blake <address@hidden>
Make gnupload friendlier for VPATH usage.
diff --git a/NEWS b/NEWS
index 72081f1..4230abb 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@ New in 1.10a:
* Version requirements:
- - Autoconf 2.61a-341 or greater is required.
+ - Autoconf 2.62 or greater is required.
* Changes to aclocal:
diff --git a/aclocal.in b/aclocal.in
index 0436205..44d3d1e 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 c6a3930..16f8a30 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.61a.379-fd8b],,
-[m4_warning([this file was generated for autoconf 2.61a.379-fd8b.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.62],,
+[m4_warning([this file was generated for autoconf 2.62.
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.
To do so, use the procedure documented by the package, typically
`autoreconf'.])])
diff --git a/configure b/configure
index 08f7586..a6ded56 100755
--- a/configure
+++ b/configure
@@ -1,11 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61a.379-fd8b for GNU Automake 1.10a.
+# Generated by GNU Autoconf 2.62 for GNU Automake 1.10a.
#
# Report bugs to <address@hidden>.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
@@ -1373,10 +1373,10 @@ test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
GNU Automake configure 1.10a
-generated by GNU Autoconf 2.61a.379-fd8b
+generated by GNU Autoconf 2.62
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1387,7 +1387,7 @@ This file contains any messages produced by compilers
while
running configure, to aid debugging if configure makes a mistake.
It was created by GNU Automake $as_me 1.10a, which was
-generated by GNU Autoconf 2.61a.379-fd8b. Invocation command line was
+generated by GNU Autoconf 2.62. Invocation command line was
$ $0 $@
@@ -1683,13 +1683,22 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the
previous run" >&2;}
,);;
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the
previous run:" >&5
+ # differences in whitespace do not lead to failure.
+ ac_old_val_w=`echo x $ac_old_val`
+ ac_new_val_w=`echo x $ac_new_val`
+ if test "$ac_old_val_w" != "$ac_new_val_w"; then
+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the
previous run:" >&5
$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- { $as_echo "$as_me:$LINENO: former value: $ac_old_val" >&5
-$as_echo "$as_me: former value: $ac_old_val" >&2;}
- { $as_echo "$as_me:$LINENO: current value: $ac_new_val" >&5
-$as_echo "$as_me: current value: $ac_new_val" >&2;}
- ac_cache_corrupted=:
+ ac_cache_corrupted=:
+ else
+ { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in
\`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the
previous run:" >&2;}
+ eval $ac_var=\$ac_old_val
+ fi
+ { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
+ { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
# Pass precious variables to config.status.
@@ -2476,7 +2485,7 @@ if test "${am_cv_autoconf_version+set}" = set; then
$as_echo_n "(cached) " >&6
else
mkdir conftest
-echo 'AC''_PREREQ(2.61a-341)' > conftest/conftest.ac
+echo 'AC''_PREREQ([2.62])' > conftest/conftest.ac
if { echo "$as_me:$LINENO: cd conftest && eval $am_AUTOCONF -o /dev/null
conftest.ac" >&5
(cd conftest && eval $am_AUTOCONF -o /dev/null conftest.ac) >&5 2>&5
ac_status=$?
@@ -3200,7 +3209,7 @@ exec 6>&1
# values after options handling.
ac_log="
This file was extended by GNU Automake $as_me 1.10a, which was
-generated by GNU Autoconf 2.61a.379-fd8b. Invocation command line was
+generated by GNU Autoconf 2.62. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -3243,10 +3252,10 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
GNU Automake config.status 1.10a
-configured by $0, generated by GNU Autoconf 2.61a.379-fd8b,
+configured by $0, generated by GNU Autoconf 2.62,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
-Copyright (C) 2007 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -3532,7 +3541,11 @@ cat >>"\$tmp/subs1.awk" <<_ACAWK &&
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" < "$tmp/subs1.awk" >
"$tmp/subs.awk" \
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+ cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
|| { { $as_echo "$as_me:$LINENO: error: could not setup config files
machinery" >&5
$as_echo "$as_me: error: could not setup config files machinery" >&2;}
{ (exit 1); exit 1; }; }
diff --git a/configure.ac b/configure.ac
index 5198d9e..08e9f41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,8 +16,6 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-dnl Require Autoconf 2.60 for AC_REQUIRE_AUX_FILE.
-AC_PREREQ(2.60)
AC_INIT([GNU Automake], [1.10a], address@hidden)
AC_CONFIG_SRCDIR(automake.in)
@@ -100,7 +98,7 @@ fi
AC_CACHE_CHECK([whether autoconf is recent enough], [am_cv_autoconf_version],
[mkdir conftest
-echo 'AC''_PREREQ(2.61a-341)' > conftest/conftest.ac
+echo 'AC''_PREREQ([[2.62]])' > conftest/conftest.ac
if AM_RUN_LOG([cd conftest && eval $am_AUTOCONF -o /dev/null conftest.ac]);
then
am_cv_autoconf_version=yes
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 b114980..33230d4 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.10a])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/init.m4 b/m4/init.m4
index 1f5c437..7104dd3 100644
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -7,7 +7,7 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 14
+# serial 15
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -24,7 +24,7 @@
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.61a-341])dnl
+[AC_PREREQ([2.62])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -84,21 +84,21 @@ AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
- [_AM_PROG_TAR([v7])])])
+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+ [_AM_PROG_TAR([v7])])])
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+ [_AM_DEPENDENCIES(CC)],
+ [define([AC_PROG_CC],
+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+ [_AM_DEPENDENCIES(CXX)],
+ [define([AC_PROG_CXX],
+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
AC_PROVIDE_IFELSE([AC_PROG_OBJC],
- [_AM_DEPENDENCIES(OBJC)],
- [define([AC_PROG_OBJC],
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+ [_AM_DEPENDENCIES(OBJC)],
+ [define([AC_PROG_OBJC],
+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
])
])
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 00f1785..8cddc57 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -389,6 +389,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 de5d003..1ba9947 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -539,6 +539,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 7f2fe0d..137b999 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 program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -31,7 +31,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/missing4.test b/tests/missing6.test
similarity index 57%
copy from tests/missing4.test
copy to tests/missing6.test
index 7f2fe0d..56c6047 100755
--- a/tests/missing4.test
+++ b/tests/missing6.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2008 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -14,36 +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/>.
-# See how well the rebuild rule handles an aclocal.m4 that was
-# generated for another version of autoconf.
+# Make sure autoconf version checks in aclocal.m4 are robust.
. ./defs || exit 1
set -e
-echo AC_OUTPUT >>configure.in
+{
+ echo 'm4_define([AC_AUTOCONF_VERSION], [9999a])'
+ echo 'm4_define([b], [oops])'
+ cat configure.in
+ echo AC_OUTPUT
+} >configure.ac
+rm configure.in
touch Makefile.am
$ACLOCAL
-$AUTOCONF
+$AUTOCONF 2>stderr
+grep 'You have another version of autoconf' stderr
+grep 'aclocal.m4:.*this file was generated for' stderr
$AUTOMAKE
./configure
$MAKE
-sed '1,20 s/AC_AUTOCONF_VERSION,/&9999/' < aclocal.m4 > aclocal.tmp
-cmp aclocal.m4 aclocal.tmp && exit 1
+sed 's/\[b\]/[a]/' < configure.ac > configure.tmp
+cmp configure.ac configure.tmp && exit 1
-mv aclocal.tmp aclocal.m4
+mv configure.tmp configure.ac
$MAKE 2>stderr
cat stderr
grep 'You have another version of autoconf' stderr
-grep -c 'aclocal.m4:.*this file was generated for' stderr
-
-$MAKE 2>stderr
-cat stderr
-grep 'You have another version of autoconf' stderr && exit 1
-grep 'aclocal.m4:.*this file was generated for' stderr && exit 1
+grep 'aclocal.m4:.*this file was generated for autoconf 9999a' stderr
:
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. Release-1-10-145-gced7549,
Eric Blake <=