Bootstrap broken

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Due to recent changes in gnulib-tool (see
http://lists.gnu.org/archive/html/bug-gnulib/2005-08/msg00241.html),
gnulib-tool now creates its own gnulib-cache.m4, designed to be checked
into CVS, rather than storing configuration in configure.ac, and the
bootstrap invocation of gnulib-tool needs to change slightly to find this
cache.

Also, the recent changes claim to make it possible to have two different
gnulib-created directories with different modules; perhaps all your
bootstrap magic to put getopt, version-etc-fsf, and version-etc in src/
instead of gnu/ can be cleaned up by using a second gnulib-tool
invocation, but my patch does not attempt that.

The new gnulib-cache.m4 was created by:
$ gnulib-tool --import --lib=libgnu --source-base=gnu --m4-base=ltdl/m4
- --aux-dir=ltdl/config --libtool --macro-prefix=gl --no-changelog assert
error exit free gettext mkstemp obstack progname regex stdbool strtol
xalloc xalloc-die xstrndup

Since gnulib-cache.m4 is a byproduct of gnulib-tool (hmm, upstream
gnulib-tool needs a patch to fix that copyright date!), and the rest of my
patch is small, I think this can be applied.  I'm still trying to convince
my employer to sign a copyright disclaimer that would let me participate
with bigger patches to GNU projects.

m4:
2005-09-02  Eric Blake  <address@hidden>  (tiny change)

        * Makefile.am (doc/m4.1): Use EXEEXT on built binary.
        * bootstrap (GNULIB_TOOL): Work with new upstream changes - find
        the correct cache, and don't change ChangeLog during bootstrap.
        * configure.ac (gl_SOURCE_BASE, gl_M4_BASE, gl_MODULES): These
        are now covered by...
        * ltdl/m4/gnulib-cache.m4: ... this new file, created by new
        upstream gnulib-tool.

m4/po:
2005-09-02  Eric Blake  <address@hidden>  (tiny change)

        * POTFILES.in (getopt.c, version-etc.c): These live in src, not
        gnu.

- --
Life is short - so eat dessert first!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDGFF784KuGfSFAYARAtbqAJ0YmB5uVJN73/PA4SOoYjMENnsd2ACfWabG
uv9DpRL8FsfvJgvmplSfHR8=
=V9sz
-----END PGP SIGNATURE-----

Index: Makefile.am
===================================================================
RCS file: /cvsroot/m4/m4/Makefile.am,v
retrieving revision 1.23
diff -u -p -b -r1.23 Makefile.am
--- Makefile.am 7 May 2005 19:46:13 -0000       1.23
+++ Makefile.am 2 Sep 2005 12:51:30 -0000
@@ -244,11 +244,11 @@ ltdl/libltdlc.la:
 info_TEXINFOS  = doc/m4.texinfo
 dist_man_MANS  = $(srcdir)/doc/m4.1
 
-$(srcdir)/doc/m4.1: doc/helptoman.pl src/m4
-       @if test -f src/m4; then \
+$(srcdir)/doc/m4.1: doc/helptoman.pl src/m4$(EXEEXT)
+       @if test -f src/m4$(EXEEXT); then \
          echo "Updating the \`man' page \`$@'"; \
-         $(PERL) $(srcdir)/doc/helptoman.pl src/m4 > address@hidden; \
-         cmp -s address@hidden $(srcdir)/doc/$@ || cp address@hidden 
$(srcdir)/doc/$@; \
+         $(PERL) $(srcdir)/doc/helptoman.pl src/m4$(EXEEXT) > address@hidden; \
+         cmp -s address@hidden $@ || cp address@hidden $@; \
          rm -f address@hidden; \
        else \
          echo "WARNING: The \`man' page \`$@' cannot be updated yet."; \
Index: bootstrap
===================================================================
RCS file: /cvsroot/m4/m4/bootstrap,v
retrieving revision 1.27
diff -u -p -b -r1.27 bootstrap
--- bootstrap   7 Jul 2005 12:18:48 -0000       1.27
+++ bootstrap   2 Sep 2005 12:51:30 -0000
@@ -80,8 +80,8 @@ gnulibdir=`echo "$gnulibdir" | $SED "$di
 ## Import Gnulib modules. ##
 ## ---------------------- ##
 
-func_echo "running: ${GNULIB_TOOL} --import"
-${GNULIB_TOOL} --import
+func_echo "running: ${GNULIB_TOOL} --import --m4-base=$config_macro_dir 
--no-changelog"
+${GNULIB_TOOL} --import --m4-base=$config_macro_dir --no-changelog
 
 func_echo "patching include directories in gnulib regex module"
 mv $config_macro_dir/regex.m4 $config_macro_dir/regex-m4.old
Index: configure.ac
===================================================================
RCS file: /cvsroot/m4/m4/configure.ac,v
retrieving revision 1.42
diff -u -p -b -r1.42 configure.ac
--- configure.ac        7 May 2005 19:46:13 -0000       1.42
+++ configure.ac        2 Sep 2005 12:51:30 -0000
@@ -143,11 +143,8 @@ m4_GNU_GETTEXT
 ## --------------- ##
 ## Gnulib support, ##
 ## --------------- ##
-gl_SOURCE_BASE(gnu)
-gl_M4_BASE(ltdl/m4)
 # We also use getopt and version-etc, but they are copied into
 # the project tree by bootstrap since they are used only by m4 itself.
-gl_MODULES(assert error exit free gettext mkstemp obstack progname regex 
stdbool strtol xalloc xalloc-die xstrndup)
 gl_INIT
 
 # Gnulib doesn't always do things quite the way M4 would like...
Index: ltdl/m4/gnulib-cache.m4
===================================================================
RCS file: ltdl/m4/gnulib-cache.m4
diff -N ltdl/m4/gnulib-cache.m4
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ ltdl/m4/gnulib-cache.m4     2 Sep 2005 12:51:31 -0000
@@ -0,0 +1,28 @@
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# Generated by gnulib-tool.
+#
+# This file represents the specification of how gnulib-tool is used.
+# It acts as a cache: It is written and read by gnulib-tool.
+# In projects using CVS, this file is meant to be stored in CVS,
+# like the configure.ac and various Makefile.am files.
+
+
+# Specification in the form of a command-line invocation:
+#   gnulib-tool --import --dir=. --lib=libgnu --source-base=gnu 
--m4-base=ltdl/m4 --aux-dir=ltdl/config --libtool -macro-prefix=gl assert error 
exit free gettext mkstemp obstack progname regex stdbool strtol xalloc 
xalloc-die xstrndup
+
+# Specification in the form of a few gnulib-tool.m4 macro invocations:
+gl_MODULES([assert error exit free gettext mkstemp obstack progname regex 
stdbool strtol xalloc xalloc-die xstrndup])
+gl_AVOID([])
+gl_SOURCE_BASE([gnu])
+gl_M4_BASE([ltdl/m4])
+gl_LIB([libgnu])
+gl_LIBTOOL
+gl_MACRO_PREFIX([gl])
+
+# gnulib-cache.m4 ends here
Index: po/POTFILES.in
===================================================================
RCS file: /cvsroot/m4/m4/po/POTFILES.in,v
retrieving revision 1.12
diff -u -p -b -r1.12 POTFILES.in
--- po/POTFILES.in      23 Sep 2004 21:07:36 -0000      1.12
+++ po/POTFILES.in      2 Sep 2005 12:51:31 -0000
@@ -1,7 +1,7 @@
-gnu/getopt.c
+src/getopt.c
 gnu/obstack.c
 gnu/regex.c
-gnu/version-etc.c
+src/version-etc.c
 gnu/xmalloc.c
 m4/builtin.c
 m4/debug.c