[SCM] GNU Autoconf source repository branch, master, updated. v2.66-17-g70201af
"Eric Blake" <[email protected]> Tue, 20 Jul 2010 13:43:30 +0000
| Newsgroups | gmane.comp.sysutils.autoconf.cvs |
|---|---|
| Message-ID | <[email protected]> |
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 Autoconf source repository".
http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=70201af851c0640cda80ec1c522e00a23906f9bf
The branch, master has been updated
via 70201af851c0640cda80ec1c522e00a23906f9bf (commit)
via f3c508423fb6c5ef8bc45c613b05dedf76a1f24e (commit)
via e4d629f5b5c19b71c3d0cebe284c5343742e41e5 (commit)
from 77469e1b540b69b1e89dabcebd7b271cce67e269 (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 70201af851c0640cda80ec1c522e00a23906f9bf
Author: Ralf Wildenhues <[email protected]>
Date: Tue Jul 20 07:35:01 2010 +0200
Let autoreconf pass warning flags to new-enough aclocal.
* bin/autoreconf.in ($aclocal_supports_warnings)
($automake_supports_warnings): New globals.
(parse_args): Set and use them. Be sure to invoke `aclocal
--help' and `automake --help' just once each.
* NEWS: Update.
Prompted by report from Bruno Haible.
Signed-off-by: Ralf Wildenhues <[email protected]>
Signed-off-by: Eric Blake <[email protected]>
commit f3c508423fb6c5ef8bc45c613b05dedf76a1f24e
Author: Ralf Wildenhues <[email protected]>
Date: Tue Jul 20 07:58:14 2010 +0200
Fix parsing of empty variable settings on the command line.
* lib/autoconf/general.m4 (_AC_INIT_PARSE_ARGS): Work around
expr bug returning 0 instead of the empty string.
* lib/autotest/general.m4 (AT_INIT): Likewise.
Signed-off-by: Ralf Wildenhues <[email protected]>
commit e4d629f5b5c19b71c3d0cebe284c5343742e41e5
Author: Ralf Wildenhues <[email protected]>
Date: Tue Jul 20 05:36:38 2010 +0200
Fix typo in the manual.
* doc/autoconf.texi (AC_ACT_IFELSE vs AC_TRY_ACT): Fix typo.
Signed-off-by: Ralf Wildenhues <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 18 ++++++++++++++++++
NEWS | 2 ++
bin/autoreconf.in | 16 +++++++++++++---
doc/autoconf.texi | 2 +-
lib/autoconf/general.m4 | 5 +++--
lib/autotest/general.m4 | 4 ++--
6 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a9ee195..1228e9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2010-07-20 Ralf Wildenhues <[email protected]>
+
+ Let autoreconf pass warning flags to new-enough aclocal.
+ * bin/autoreconf.in ($aclocal_supports_warnings)
+ ($automake_supports_warnings): New globals.
+ (parse_args): Set and use them. Be sure to invoke `aclocal
+ --help' and `automake --help' just once each.
+ * NEWS: Update.
+ Prompted by report from Bruno Haible.
+
+ Fix parsing of empty variable settings on the command line.
+ * lib/autoconf/general.m4 (_AC_INIT_PARSE_ARGS): Work around
+ expr bug returning 0 instead of the empty string.
+ * lib/autotest/general.m4 (AT_INIT): Likewise.
+
+ Fix typo in the manual.
+ * doc/autoconf.texi (AC_ACT_IFELSE vs AC_TRY_ACT): Fix typo.
+
2010-07-19 Eric Blake <[email protected]>
Fix up AC_INIT vs. " issues, and document it.
diff --git a/NEWS b/NEWS
index a8683c6..a1ce558 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,8 @@ GNU Autoconf NEWS - User visible changes.
in other contexts, e.g., for Automake, and may be subject to
further restrictions in the future. Regression introduced in 2.66.
+** autoreconf passes warning flags to new enough versions of aclocal.
+
* Major changes in Autoconf 2.66 (2010-07-02) [stable]
Released by Eric Blake, based on git versions 2.65.*.
diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index 0fc3bb8..e22f7b6 100644
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -122,8 +122,12 @@ my $install = 0;
my $symlink = 0;
# Does aclocal support --force?
my $aclocal_supports_force = 0;
+# Does aclocal support -Wfoo?
+my $aclocal_supports_warnings = 0;
# Does automake support --force-missing?
my $automake_supports_force_missing = 0;
+# Does automake support -Wfoo?
+my $automake_supports_warnings = 0;
my @prepend_include;
my @include;
@@ -182,8 +186,12 @@ sub parse_args ()
}
}
- $aclocal_supports_force = `$aclocal --help 2>/dev/null` =~ /--force/;
- $automake_supports_force_missing = `$automake --help 2>/dev/null` =~ /--force-missing/;
+ my $aclocal_help = `$aclocal --help 2>/dev/null`;
+ my $automake_help = `$automake --help 2>/dev/null`;
+ $aclocal_supports_force = $aclocal_help =~ /--force/;
+ $aclocal_supports_warnings = $aclocal_help =~ /--warnings/;
+ $automake_supports_force_missing = $automake_help =~ /--force-missing/;
+ $automake_supports_warnings = $automake_help =~ /--warnings/;
# Dispatch autoreconf's option to the tools.
# --include;
@@ -242,7 +250,9 @@ sub parse_args ()
$autoconf .= $warn;
$autoheader .= $warn;
$automake .= $warn
- if `$automake --help` =~ /--warnings/;
+ if $automake_supports_warnings;
+ $aclocal .= $warn
+ if $aclocal_supports_warnings;
}
}
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 8d0f7d3..cba4b1b 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -23291,7 +23291,7 @@ The @code{LIBOBJDIR} feature is experimental.
@acindex{TRY_@var{ACT}}
Since Autoconf 2.50, internal codes uses @code{AC_PREPROC_IFELSE},
@code{AC_COMPILE_IFELSE}, @code{AC_LINK_IFELSE}, and
-@code{AC_RUN_IFELSE} on one hand and @code{AC_LANG_SOURCES},
+@code{AC_RUN_IFELSE} on one hand and @code{AC_LANG_SOURCE},
and @code{AC_LANG_PROGRAM} on the other hand instead of the deprecated
@code{AC_TRY_CPP}, @code{AC_TRY_COMPILE}, @code{AC_TRY_LINK}, and
@code{AC_TRY_RUN}. The motivations where:
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 477c4ab..bb18845 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -613,8 +613,9 @@ do
fi
case $ac_option in
- *=*) ac_optarg=`expr "X$ac_option" : '[[^=]]*=\(.*\)'` ;;
- *) ac_optarg=yes ;;
+ *=?*) ac_optarg=`expr "X$ac_option" : '[[^=]]*=\(.*\)'` ;;
+ *=) ac_optarg= ;;
+ *) ac_optarg=yes ;;
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 2b46705..e27d601 100644
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -474,8 +474,8 @@ do
fi
case $at_option in
- *=*) at_optarg=`expr "x$at_option" : 'x[[^=]]*=\(.*\)'` ;;
- *) at_optarg= ;;
+ *=?*) at_optarg=`expr "X$at_option" : '[[^=]]*=\(.*\)'` ;;
+ *) at_optarg= ;;
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
hooks/post-receive
--
GNU Autoconf source repository