* lib/autotest/general.m4 (AT_INIT): Dump config.log last.

Pass $at_debug_args to the rerun test suite.
* lib/m4sugar/Makefile.am (DISTCLEANFILES): New.
* bin/Makefile.am (ETAGS_SH): Don't use characters ranges.
From Paul Eggert.

diff --git a/ChangeLog b/ChangeLog
index 5b148714353eaa1bfb630e9dfda8c36d6db482d7..46350154483be7da905135bb0938cb3fea0a6a1e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-09-23  Akim Demaille  <akim@epita.fr>
+
+       * lib/autotest/general.m4 (AT_INIT): Dump config.log last.
+       Pass $at_debug_args to the rerun test suite.
+       * lib/m4sugar/Makefile.am (DISTCLEANFILES): New.
+       * bin/Makefile.am (ETAGS_SH): Don't use characters ranges.
+       From Paul Eggert.
+
 2001-09-23  Akim Demaille  <akim@epita.fr>
 
        * bin/autom4te.in (@my_warning): Remove, handled by `autom4te.cfg'.

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 360b18a4d8a58c7dbe8ba5afbc81bb90c32407a4..8f7d949343403660ddd4dbc63aa60835ab2425f9 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -99,9 +99,13 @@ autom4te: $(srcdir)/autom4te.in $(top_srcdir)/configure.ac
 
 TAGS_DEPENDENCIES = $(EXTRA_DIST)
 
+letters = abcdefghijklmnopqrstuvwxyz
+LETTERS = ABCDEFGHIJKLMNOPQRSTUVWXYZ
+DIGITS = 0123456789
+WORD_REGEXP = [$(LETTERS)$(letters)_][$(LETTERS)$(letters)$(DIGITS)_]*
 ETAGS_PERL = --lang=perl \
   autoreconf.in autoupdate.in autoscan.in autom4te.in
-ETAGS_SH = --lang=none --regex='/\([a-zA-Z_][a-zA-Z_0-9]*\)=/\1/' \
+ETAGS_SH = --lang=none --regex='/\($(WORD_REGEXP)\)=/\1/' \
   autoconf.in autoheader.in ifnames.in
 
 ETAGS_ARGS = $(ETAGS_PERL) $(ETAGS_SH)

diff --git a/bin/Makefile.in b/bin/Makefile.in
index 48e95c29e670baf477bf28956772481d3ef6d5b9..2773c48ce3f61730f0df6d65e7103cec05ff44eb 100644 (file)
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -91,10 +91,14 @@ edit = sed \
 
 TAGS_DEPENDENCIES = $(EXTRA_DIST)
 
+letters = abcdefghijklmnopqrstuvwxyz
+LETTERS = ABCDEFGHIJKLMNOPQRSTUVWXYZ
+DIGITS = 0123456789
+WORD_REGEXP = [$(LETTERS)$(letters)_][$(LETTERS)$(letters)$(DIGITS)_]*
 ETAGS_PERL = --lang=perl \
   autoreconf.in autoupdate.in autoscan.in autom4te.in
 
-ETAGS_SH = --lang=none --regex='/\([a-zA-Z_][a-zA-Z_0-9]*\)=/\1/' \
+ETAGS_SH = --lang=none --regex='/\($(WORD_REGEXP)\)=/\1/' \
   autoconf.in autoheader.in ifnames.in
 
 

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 14e4dc55c16954efc1ace4f666174ff0d2dc7a7e..a288254a56705d29423236cfe88d8c83f89a2e73 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -389,15 +389,6 @@ AS_BOX(m4_defn([AT_TESTSUITE_NAME]))
 
     AS_UNAME
     echo
-
-    AS_BOX([Configuration logs.])
-    echo
-    for at_file in `find "$top_srcdir" -name config.log -print`
-    do
-      echo "$as_me: $at_file:"
-      sed 's/^/| /;10q' $at_file
-      echo
-    done
   fi
 
   # Inform about the contents of the config files.
@@ -569,7 +560,23 @@ elif test $at_debug = false; then
     echo
   } >&AS_MESSAGE_LOG_FD
 
-  $SHELL $[0] -v -d $at_fail_list 2>&1 | tee -a $as_me.log
+  $SHELL $[0] -v -d $at_debug_args $at_fail_list 2>&1 | tee -a $as_me.log
+
+  {
+    echo
+    if test -n "$top_srcdir"; then
+      AS_BOX([Configuration logs.])
+      echo
+      for at_file in `find "$top_srcdir" -name config.log -print`
+      do
+       echo "$as_me: $at_file:"
+       sed 's/^/| /;10q' $at_file
+       echo
+      done
+    fi
+  } >&AS_MESSAGE_LOG_FD
+
+
   AS_BOX([$as_me.log is created.])
 
   echo

diff --git a/lib/m4sugar/Makefile.am b/lib/m4sugar/Makefile.am
index 9ed378c50601fddb57d22c2ea39328f6c10c736e..ec7329db77fcdd6b8f3058e74ef6e23a0382a244 100644 (file)
--- a/lib/m4sugar/Makefile.am
+++ b/lib/m4sugar/Makefile.am
@@ -3,6 +3,7 @@
 m4sugarlibdir = $(pkgdatadir)/m4sugar
 dist_m4sugarlib_DATA = m4sugar.m4 m4sh.m4
 nodist_m4sugarlib_DATA = version.m4
+DISTCLEANFILES         = $(nodist_m4sugarlib_DATA)
 
 ## ------------ ##
 ## version.m4.  ##

diff --git a/lib/m4sugar/Makefile.in b/lib/m4sugar/Makefile.in
index 83f43749cb193a759f8eb5ffa0c895789d7255f9..9d2b2ab5aa3d33540b956e3587a36d533fd14d4e 100644 (file)
--- a/lib/m4sugar/Makefile.in
+++ b/lib/m4sugar/Makefile.in
@@ -66,6 +66,7 @@ VERSION = @VERSION@
 m4sugarlibdir = $(pkgdatadir)/m4sugar
 dist_m4sugarlib_DATA = m4sugar.m4 m4sh.m4
 nodist_m4sugarlib_DATA = version.m4
+DISTCLEANFILES = $(nodist_m4sugarlib_DATA)
 
 TAGS_FILES = $(dist_m4sugarlib_DATA)
 
@@ -205,6 +206,7 @@ clean-generic:
 
 distclean-generic:
        -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
+       -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"