Version 2.57d.

* bin/Makefile.am (edit): Handle '@configure_input@'.
(autoconf, autoheader, autom4te, autoreconf, autoscan, autoupdate)
(ifnames): chmod -w.
* tests/wrapper.as (AUTOCONF, AUTOM4TE, ): Point to tests/
executables, not bin/ executables!  Otherwise all the magic needed
to find non installed files is turned off.  This caused a failure
of test 40 and 41 that ran aclocal 1.8 which in turn ran autom4te
as found in its environment (sent by tests/autoreconf): pointing
to bin/autom4te that could not find its files.
* tests/mktests.sh: Force the replacement of generated files, for
the sake of "mv" program that are interactive when overwriting a
-w file.
* config/install-sh: Upgrade from CVS Automake.

diff --git a/ChangeLog b/ChangeLog
index bfc6ac6c557b5159bff75e392983bb3f03645c79..277386fe80575b8e8c7c5281bcc5e2b300fc7119 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,18 @@
 
        Version 2.57d.
 
+       * bin/Makefile.am (edit): Handle '@configure_input@'.
+       (autoconf, autoheader, autom4te, autoreconf, autoscan, autoupdate)
+       (ifnames): chmod -w.
+       * tests/wrapper.as (AUTOCONF, AUTOM4TE, ): Point to tests/
+       executables, not bin/ executables!  Otherwise all the magic needed
+       to find non installed files is turned off.  This caused a failure
+       of test 40 and 41 that ran aclocal 1.8 which in turn ran autom4te
+       as found in its environment (sent by tests/autoreconf): pointing
+       to bin/autom4te that could not find its files.
+       * tests/mktests.sh: Force the replacement of generated files, for
+       the sake of "mv" program that are interactive when overwriting a
+       -w file.
        * config/install-sh: Upgrade from CVS Automake.
 
 2003-09-23  Paul Eggert  <eggert@twinsun.com>

diff --git a/bin/Makefile.am b/bin/Makefile.am
index c71b5fd48816412db7bac9da54a7574deb403a06..378f7f987a2bcb75563ef319ddf83586a4f69f06 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -47,7 +47,8 @@ edit = sed \
        -e 's,@M4\@,$(M4),g' \
        -e 's,@AWK\@,$(AWK),g' \
        -e 's,@VERSION\@,$(VERSION),g' \
-       -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g'
+       -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
+       -e 's,@configure_input\@,Generated from $<; do not edit by hand.,g'
 
 # autoconf is written in M4sh.
 AUTOM4SH = $(top_builddir)/tests/autom4te --language M4sh --cache ''
@@ -58,47 +59,55 @@ $(srcdir)/autoconf.in: $(srcdir)/autoconf.as # FIXME: $(m4sh_m4f_dependencies)
 ## when the prefix etc. changes.  It took quite a while to have these
 ## rules correct, don't break them!  In particular, we believe there is
 ## no solution to factor the code.
+## Use chmod -w to prevent people from editing the wrong file by accident.
 autoconf: $(srcdir)/autoconf.in Makefile
        rm -f autoconf autoconf.tmp
        $(edit) $(srcdir)/autoconf.in >autoconf.tmp
        chmod +x autoconf.tmp
-       mv autoconf.tmp autoconf
+       chmod -w autoconf.tmp
+       mv -f autoconf.tmp autoconf
 
 autoheader: $(srcdir)/autoheader.in Makefile
        rm -f autoheader autoheader.tmp
        $(edit) $(srcdir)/autoheader.in >autoheader.tmp
        chmod +x autoheader.tmp
-       mv autoheader.tmp autoheader
+       chmod -w autoheader.tmp
+       mv -f autoheader.tmp autoheader
 
 autom4te: $(srcdir)/autom4te.in Makefile
        rm -f autom4te autom4te.tmp
        $(edit) $(srcdir)/autom4te.in >autom4te.tmp
        chmod +x autom4te.tmp
-       mv autom4te.tmp autom4te
+       chmod -w autom4te.tmp
+       mv -f autom4te.tmp autom4te
 
 autoreconf: $(srcdir)/autoreconf.in Makefile
        rm -f autoreconf autoreconf.tmp
        $(edit) $(srcdir)/autoreconf.in >autoreconf.tmp
        chmod +x autoreconf.tmp
-       mv autoreconf.tmp autoreconf
+       chmod -w autoreconf.tmp
+       mv -f autoreconf.tmp autoreconf
 
 autoscan: $(srcdir)/autoscan.in Makefile
        rm -f autoscan autoscan.tmp
        $(edit) $(srcdir)/autoscan.in >autoscan.tmp
        chmod +x autoscan.tmp
-       mv autoscan.tmp autoscan
+       chmod -w autoscan.tmp
+       mv -f autoscan.tmp autoscan
 
 autoupdate: $(srcdir)/autoupdate.in Makefile
        rm -f autoupdate autoupdate.tmp
        $(edit) $(srcdir)/autoupdate.in >autoupdate.tmp
        chmod +x autoupdate.tmp
-       mv autoupdate.tmp autoupdate
+       chmod -w autoupdate.tmp
+       mv -f autoupdate.tmp autoupdate
 
 ifnames: $(srcdir)/ifnames.in Makefile
        rm -f ifnames ifnames.tmp
        $(edit) $(srcdir)/ifnames.in >ifnames.tmp
        chmod +x ifnames.tmp
-       mv ifnames.tmp ifnames
+       chmod -w ifnames.tmp
+       mv -f ifnames.tmp ifnames
 
 
 

diff --git a/bin/Makefile.in b/bin/Makefile.in
index d829f1415abe98284fcbb7deac5c28a8572fefe1..00ec85509085b153921b8a6c9db351756b264436 100644 (file)
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -193,7 +193,8 @@ edit = sed \
        -e 's,@M4\@,$(M4),g' \
        -e 's,@AWK\@,$(AWK),g' \
        -e 's,@VERSION\@,$(VERSION),g' \
-       -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g'
+       -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
+       -e 's,@configure_input\@,Generated from $<; do not edit by hand.,g'
 
 
 # autoconf is written in M4sh.
@@ -465,43 +466,50 @@ autoconf: $(srcdir)/autoconf.in Makefile
        rm -f autoconf autoconf.tmp
        $(edit) $(srcdir)/autoconf.in >autoconf.tmp
        chmod +x autoconf.tmp
-       mv autoconf.tmp autoconf
+       chmod -w autoconf.tmp
+       mv -f autoconf.tmp autoconf
 
 autoheader: $(srcdir)/autoheader.in Makefile
        rm -f autoheader autoheader.tmp
        $(edit) $(srcdir)/autoheader.in >autoheader.tmp
        chmod +x autoheader.tmp
-       mv autoheader.tmp autoheader
+       chmod -w autoheader.tmp
+       mv -f autoheader.tmp autoheader
 
 autom4te: $(srcdir)/autom4te.in Makefile
        rm -f autom4te autom4te.tmp
        $(edit) $(srcdir)/autom4te.in >autom4te.tmp
        chmod +x autom4te.tmp
-       mv autom4te.tmp autom4te
+       chmod -w autom4te.tmp
+       mv -f autom4te.tmp autom4te
 
 autoreconf: $(srcdir)/autoreconf.in Makefile
        rm -f autoreconf autoreconf.tmp
        $(edit) $(srcdir)/autoreconf.in >autoreconf.tmp
        chmod +x autoreconf.tmp
-       mv autoreconf.tmp autoreconf
+       chmod -w autoreconf.tmp
+       mv -f autoreconf.tmp autoreconf
 
 autoscan: $(srcdir)/autoscan.in Makefile
        rm -f autoscan autoscan.tmp
        $(edit) $(srcdir)/autoscan.in >autoscan.tmp
        chmod +x autoscan.tmp
-       mv autoscan.tmp autoscan
+       chmod -w autoscan.tmp
+       mv -f autoscan.tmp autoscan
 
 autoupdate: $(srcdir)/autoupdate.in Makefile
        rm -f autoupdate autoupdate.tmp
        $(edit) $(srcdir)/autoupdate.in >autoupdate.tmp
        chmod +x autoupdate.tmp
-       mv autoupdate.tmp autoupdate
+       chmod -w autoupdate.tmp
+       mv -f autoupdate.tmp autoupdate
 
 ifnames: $(srcdir)/ifnames.in Makefile
        rm -f ifnames ifnames.tmp
        $(edit) $(srcdir)/ifnames.in >ifnames.tmp
        chmod +x ifnames.tmp
-       mv ifnames.tmp ifnames
+       chmod -w ifnames.tmp
+       mv -f ifnames.tmp ifnames
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/tests/acc.at b/tests/acc.at
index 8d28902862723d61c3551aedb10ed0693a7e0cac..f07e25eb4c2317475ffa044ea39efe236de9febc 100644 (file)
--- a/tests/acc.at
+++ b/tests/acc.at
@@ -15,6 +15,7 @@ AT_CHECK_MACRO([AC_C_CHAR_UNSIGNED])
 AT_CHECK_MACRO([AC_C_LONG_DOUBLE])
 AT_CHECK_MACRO([AC_C_STRINGIZE])
 AT_CHECK_MACRO([AC_PROG_CC_C_O])
+AT_CHECK_MACRO([AC_PROG_CPP_WERROR])
 AT_CHECK_MACRO([AC_PROG_GCC_TRADITIONAL])
 
 # Obsolete macros.

diff --git a/tests/mktests.sh b/tests/mktests.sh
index b9456347d88044e9b24dc345f87a892f3988b7db..3322f2df7d572ecd0c67c6a318c0da1aeca915c2 100755 (executable)
--- a/tests/mktests.sh
+++ b/tests/mktests.sh
@@ -249,7 +249,7 @@ MK_EOF
   # preserves the old version of the file.  If there is nothing to
   # check, output /rien du tout/[1].
   if grep AT_CHECK ac$base.tat >/dev/null 2>&1; then
-    mv ac$base.tat ac$base.at
+    mv -f ac$base.tat ac$base.at
     # Help people not to update these files by hand.
     chmod a-w ac$base.at
   else

diff --git a/tests/torture.at b/tests/torture.at
index f3531478116def328c2f14a833027eade9035b05..bf61d7bbf029200c4cb86bbb5a5b1d40c93ce2c3 100644 (file)
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -602,7 +602,9 @@ AC_CONFIG_SUBDIRS([inner])
 AC_OUTPUT
 ]])
 
-AT_CHECK([autoreconf])
+# If there are improperly quoted AC_DEFUN installed in share/aclocal,
+# they trigger warnings from aclocal 1.8, so ignore stderr.
+AT_CHECK([autoreconf], [], [], [ignore])
 AT_CHECK([test -f inner/configure])
 
 # Running the outer configure recursively should provide the innermost

diff --git a/tests/wrapper.as b/tests/wrapper.as
index ff3d9b3eb22197786a75ce9d192391f8d6435a9b..96204bca712fd071700360525bef899fb9e63063 100644 (file)
--- a/tests/wrapper.as
+++ b/tests/wrapper.as
@@ -1,10 +1,28 @@
-AS_INIT[]dnl                                         -*- shell-script -*-
+# wrapper.as -- running `$0' as if it were installed.   -*- shell-script -*-
 # @configure_input@
-# Running `$0' as if it were installed.
+# Copyright (C) 2003 Free Software Foundation, Inc.
 
-AUTOCONF=@abs_top_builddir@/bin/autoconf
-AUTOHEADER=@abs_top_builddir@/bin/autoheader
-AUTOM4TE=@abs_top_builddir@/bin/autom4te
+# 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+AS_INIT[]dnl
+
+testdir=@abs_top_builddir@/tests
+AUTOCONF=$testdir/autoconf
+AUTOHEADER=$testdir/autoheader
+AUTOM4TE=$testdir/autom4te
 AUTOM4TE_CFG=@abs_top_builddir@/lib/autom4te.cfg
 autom4te_perllibdir=@abs_top_srcdir@/lib
 export AUTOCONF AUTOHEADER AUTOM4TE AUTOM4TE_CFG autom4te_perllibdir

diff --git a/tests/wrapper.in b/tests/wrapper.in
index faf4b09d39fb052c4f6806c82d77e0dd449e8ea6..27d59c0cc6cbc03136f1509aac2bee64bfe78445 100755 (executable)
--- a/tests/wrapper.in
+++ b/tests/wrapper.in
@@ -15,7 +15,7 @@ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
 fi
 
 # Support unset when possible.
-if (as_foo=foo; unset as_foo) >/dev/null 2>&1; then
+if ((MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   as_unset=unset
 else
   as_unset=false
@@ -58,9 +58,9 @@ fi
 # Name of the executable.
 as_me=`$as_basename "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-       X"$0" : 'X\(//\)$' \| \
-       X"$0" : 'X\(/\)$' \| \
-       .     : '\(.\)' 2>/dev/null ||
+        X"$0" : 'X\(//\)$' \| \
+        X"$0" : 'X\(/\)$' \| \
+        .     : '\(.\)' 2>/dev/null ||
 echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
          /^X\/\(\/\/\)$/{ s//\1/; q; }
@@ -68,12 +68,11 @@ echo X/"$0" |
          s/.*/./; q'`
 
 
-# @configure_input@
-# Running `$0' as if it were installed.
 
-AUTOCONF=@abs_top_builddir@/bin/autoconf
-AUTOHEADER=@abs_top_builddir@/bin/autoheader
-AUTOM4TE=@abs_top_builddir@/bin/autom4te
+testdir=@abs_top_builddir@/tests
+AUTOCONF=$testdir/autoconf
+AUTOHEADER=$testdir/autoheader
+AUTOM4TE=$testdir/autom4te
 AUTOM4TE_CFG=@abs_top_builddir@/lib/autom4te.cfg
 autom4te_perllibdir=@abs_top_srcdir@/lib
 export AUTOCONF AUTOHEADER AUTOM4TE AUTOM4TE_CFG autom4te_perllibdir