FYI: bootstrap

[Akim Demaille]

I remove aclocal.m4 from the repo too.  The one you see below is what
is created.

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * bootstrap.sh: Create aclocal.m4 instead of modifying it.
        This also help having a single list of m4 files: in
        config/Makefile.am.
        * config/Makefile.am (STANDARD_MACROS): Rename as...
        (ACLOCAL_MACROS): this.
        (list-standard-macros): Remove.
        (spy): New.

Index: aclocal.m4
===================================================================
RCS file: /cvsroot/m4/m4/aclocal.m4,v
retrieving revision 1.4
diff -u -u -r1.4 aclocal.m4
--- aclocal.m4 2001/08/27 08:32:37 1.4
+++ aclocal.m4 2001/08/30 12:12:39
@@ -1,17 +1,19 @@
+# This file was gererated by ./bootstrap.
+# Do not edit by hand, *nor by aclocal*.
+
+# Non Autoconf additional macros.
 m4_include([acinclude.m4])
+
+# aclocal macros.
 m4_include([config/auxdir.m4])
 m4_include([config/ccstdc.m4])
 m4_include([config/codeset.m4])
 m4_include([config/cond.m4])
-m4_include([config/debug.m4])
 m4_include([config/depend.m4])
 m4_include([config/depout.m4])
 m4_include([config/dmalloc.m4])
-m4_include([config/error.m4])
 m4_include([config/gettext.m4])
 m4_include([config/glibc21.m4])
-m4_include([config/gmp.m4])
-m4_include([config/gnu-obstack.m4])
 m4_include([config/header.m4])
 m4_include([config/iconv.m4])
 m4_include([config/init.m4])
@@ -22,10 +24,16 @@
 m4_include([config/missing.m4])
 m4_include([config/progtest.m4])
 m4_include([config/protos.m4])
-m4_include([config/regex.m4])
 m4_include([config/sanity.m4])
-m4_include([config/stackovf.m4])
 m4_include([config/strip.m4])
+
+# GNU M4 macros.
+m4_include([config/debug.m4])
+m4_include([config/error.m4])
+m4_include([config/gmp.m4])
+m4_include([config/gnu-obstack.m4])
+m4_include([config/stackovf.m4])
+
 # Help Automake understand includes.
 ifelse(
   [
Index: bootstrap
===================================================================
RCS file: /cvsroot/m4/m4/bootstrap,v
retrieving revision 1.10
diff -u -u -r1.10 bootstrap
--- bootstrap 2001/08/28 03:06:14 1.10
+++ bootstrap 2001/08/30 12:12:39
@@ -6,20 +6,51 @@
 auxdir=`grep '^AC_CONFIG_AUX_DIR' configure.in | sed 's/^.*(\([^)]*\)).*$/\1/'`
 
 rm -f config.cache
+rm aclocal.m4
 
 # Make a copy of each Automake/Gettext m4 file we need.
 aclocal_libdir=`aclocal --print-ac-dir`
-for i in `make -f config/Makefile.am list-standard-macros`
+for i in `make -f config/Makefile.am spy SPIED=ACLOCAL_MACROS`
 do
   cp $aclocal_libdir/$i config ||
     echo "$0: cannot find $i" >&2
 done
 
+
+# aclocal is one of the worst things that ever happened to the GNU
+# build system...
+{
+  sed 's/^  //' <<EOF
+  # This file was gererated by $0.
+  # Do not edit by hand, *nor by aclocal*.
+
+  # Non Autoconf additional macros.
+  m4_include([acinclude.m4])
+
+  # aclocal macros.
+EOF
+  for i in `make -f config/Makefile.am spy SPIED=ACLOCAL_MACROS`
+  do
+    echo "m4_include([config/$i])"
+  done
+  echo
+  echo '# GNU M4 macros.'
+  for i in `make -f config/Makefile.am spy SPIED=SPECIFIC_MACROS`
+  do
+    echo "m4_include([config/$i])"
+  done
+  echo
+} >aclocal.m4
+
+
 # Automake understands nothing to our aclocal and misses all its
-# AC_SUBST...  Output them, but in a way that makes m4 ignore then.
-(
-  set -e
-  sed -n '1,/# Help Automake understand includes./p' aclocal.m4
+# AC_SUBST...  We need aclocal to contain the includes though, otherwise
+# autoconf won't see them either :)
+# Output them, but in a way that makes m4 ignore then.
+#
+# Don't have aclocal grow while autoconf reads it: use aclocal.m4t.
+{
+  echo '# Help Automake understand includes.'
   echo "ifelse("
   echo "  ["
   echo "    # It doesn't see AC_SUBSTs."
@@ -28,8 +59,9 @@
   autoconf -t AM_CONDITIONAL:'    AM_CONDITIONAL([$1])' | sort -u
   echo "  ]"
   echo ")"
-) >aclocal.m4t
-mv aclocal.m4t aclocal.m4
+} >aclocal.m4t
+
+cat aclocal.m4t >>aclocal.m4
 
 # shtoolize -q -I ./$auxdir echo move install mkdir version || exit 1
 # libtoolize -f -c || exit 1
Index: config/Makefile.am
===================================================================
RCS file: /cvsroot/m4/m4/config/Makefile.am,v
retrieving revision 1.6
diff -u -u -r1.6 Makefile.am
--- config/Makefile.am 2001/08/27 07:49:30 1.6
+++ config/Makefile.am 2001/08/30 12:12:39
@@ -23,10 +23,10 @@
 Makefile.in                                    \
 ltmain.sh                                      \
 texinfo.tex                                    \
-$(STANDARD_MACROS)                             \
+$(ACLOCAL_MACROS)                              \
 $(STANDARD_TOOLS)
 
-STANDARD_MACROS =                              \
+ACLOCAL_MACROS =                               \
 auxdir.m4                                      \
 ccstdc.m4                                      \
 codeset.m4                                     \
@@ -66,7 +66,7 @@
 gnu-obstack.m4                                 \
 stackovf.m4
 
-list-standard-macros:
-       @echo $(STANDARD_MACROS)
+spy:
+       @echo $($(SPIED))
 
-EXTRA_DIST = $(SPECIFIC_MACROS) $(STANDARD_MACROS)
+EXTRA_DIST = $(SPECIFIC_MACROS) $(ACLOCAL_MACROS)