FYI: distcheck adjustments

[Akim Demaille]

Index: ChangeLog

        * 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.

Index: bin/Makefile.am
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/Makefile.am,v
retrieving revision 1.14
diff -u -u -r1.14 Makefile.am
--- bin/Makefile.am 23 May 2003 13:09:29 -0000 1.14
+++ bin/Makefile.am 25 Sep 2003 09:29:59 -0000
@@ -47,7 +47,8 @@
        -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 @@
 ## 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
 
 
 
Index: bin/Makefile.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/Makefile.in,v
retrieving revision 1.38
diff -u -u -r1.38 Makefile.in
--- bin/Makefile.in 25 Sep 2003 08:33:34 -0000 1.38
+++ bin/Makefile.in 25 Sep 2003 09:29:59 -0000
@@ -193,7 +193,8 @@
        -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 @@
        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:
Index: tests/acc.at
===================================================================
RCS file: /cvsroot/autoconf/autoconf/tests/acc.at,v
retrieving revision 1.7
diff -u -u -r1.7 acc.at
--- tests/acc.at 10 Sep 2003 16:54:12 -0000 1.7
+++ tests/acc.at 25 Sep 2003 09:29:59 -0000
@@ -15,6 +15,7 @@
 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.
Index: tests/mktests.sh
===================================================================
RCS file: /cvsroot/autoconf/autoconf/tests/mktests.sh,v
retrieving revision 1.35
diff -u -u -r1.35 mktests.sh
--- tests/mktests.sh 10 Sep 2003 16:54:12 -0000 1.35
+++ tests/mktests.sh 25 Sep 2003 09:29:59 -0000
@@ -249,7 +249,7 @@
   # 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
Index: tests/torture.at
===================================================================
RCS file: /cvsroot/autoconf/autoconf/tests/torture.at,v
retrieving revision 1.44
diff -u -u -r1.44 torture.at
--- tests/torture.at 23 Jun 2003 14:34:48 -0000 1.44
+++ tests/torture.at 25 Sep 2003 09:29:59 -0000
@@ -602,7 +602,9 @@
 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
Index: tests/wrapper.as
===================================================================
RCS file: /cvsroot/autoconf/autoconf/tests/wrapper.as,v
retrieving revision 1.1
diff -u -u -r1.1 wrapper.as
--- tests/wrapper.as 17 Jul 2002 10:13:33 -0000 1.1
+++ tests/wrapper.as 25 Sep 2003 09:29:59 -0000
@@ -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.
 
address@hidden@/bin/autoconf
address@hidden@/bin/autoheader
address@hidden@/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
+
address@hidden@/tests
+AUTOCONF=$testdir/autoconf
+AUTOHEADER=$testdir/autoheader
+AUTOM4TE=$testdir/autom4te
 address@hidden@/lib/autom4te.cfg
 address@hidden@/lib
 export AUTOCONF AUTOHEADER AUTOM4TE AUTOM4TE_CFG autom4te_perllibdir
Index: tests/wrapper.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/tests/wrapper.in,v
retrieving revision 1.3
diff -u -u -r1.3 wrapper.in
--- tests/wrapper.in 22 May 2003 13:24:08 -0000 1.3
+++ tests/wrapper.in 25 Sep 2003 09:29:59 -0000
@@ -15,7 +15,7 @@
 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 @@
 # 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 @@
          s/.*/./; q'`
 
 
-# @configure_input@
-# Running `$0' as if it were installed.
 
address@hidden@/bin/autoconf
address@hidden@/bin/autoheader
address@hidden@/bin/autom4te
address@hidden@/tests
+AUTOCONF=$testdir/autoconf
+AUTOHEADER=$testdir/autoheader
+AUTOM4TE=$testdir/autom4te
 address@hidden@/lib/autom4te.cfg
 address@hidden@/lib
 export AUTOCONF AUTOHEADER AUTOM4TE AUTOM4TE_CFG autom4te_perllibdir