bootstrap broken

[Eric Blake]

The current bootstrap of CVS head is broken:

[...]
bootstrap: fetching modules for src directory
bootstrap: copying file `src/getopt_.h'
cp: cannot stat `/usr/local/bin/lib/getopt_.h': No such file or directory

I traced it to this line in bootstrap:
gnulibdir=`which gnulib-tool | $SED "$dirname"`

First, it is looking for gnulib-tool on the path, instead of $GNULIB_TOOL.  
Second, since CVS gnulib does not have a `make install' to install gnulib-tool 
in any reasonable manner, my setup is that $HOME/gnulib contains the CVS 
snapshot, and /usr/local/bin/gnulib-tool is just a symlink to 
$HOME/gnulib/gnulib-tool, so that I did not have to edit my $PATH.  But that 
means that $gnulibdir in bootstrap is not pointing to the actual gnulib 
repository, just the directory where my symlink lives, explaining the failed cp.

Maybe I should also send a feature request to the gnulib tool, asking for a 
`configure; make; make install' feature that installs gnulib-tool on the path, 
and a `gnulib-tool --location' or something like that to allow scripts to learn 
where gnulib-tool is grabbing its files.

This patch allowed bootstrap to complete:

2005-05-12  Eric Blake  <address@hidden>  (tiny change)

        * bootstrap (gnulibdir): Use $GNULIB_TOOL, and allow it to be a
        symlink.

Index: bootstrap
===================================================================
RCS file: /cvsroot/m4/m4/bootstrap,v
retrieving revision 1.25
diff -u -b -r1.25 bootstrap
--- bootstrap   6 May 2005 08:30:52 -0000       1.25
+++ bootstrap   12 May 2005 15:05:06 -0000
@@ -52,7 +52,8 @@
 EOF
 
 func_echo "fetching modules for src directory"
-gnulibdir=`which gnulib-tool | $SED "$dirname"`
+gnulibdir=`which "$GNULIB_TOOL"`
+gnulibdir=`readlink -f "$gnulibdir" | $SED "$dirname"`
 
 for file in `${GNULIB_TOOL} --extract-filelist $src_modules`; do