HEAD: workaround for released autotools

[Ralf Wildenhues]

This is an ugly (from a stylistic point of view) patch to make CVS HEAD
Libtool work with Autoconf 2.59 and Automake 1.9.5, which lack features
in their support for AC_CONFIG_LIBOBJ_DIR: just symlink the libobj
source files into $top_srcdir from bootstrap, and distribute them.

This will cause duplicate identical (non-symlinked) copies in the
tarball.  As of this patch, a tarball will not contain any
synchronisation mechanism of the two copies of each, unlike with a
bootstrapped CVS checkout on a machine with working "ln -s".  But since
the respective files are neither large by any means, nor contain code
likely to change a lot (even be changed by users at all), I believe this
ought to suffice.  I can add a note to HACKING about this if you like.

Note that the EXTRA_DIST additions are unnecessary in built file
libltdl/Makefile.am, because within libltdl-as-subpackage, the macro
AC_CONFIG_LIBOBJ_DIR is not used, so everything works already.

OK to apply?

Cheers,
Ralf

        Allow for portability with Autoconf 2.59, Automake 1.9.6,
        which lack AC_CONFIG_LIBOBJ_DIR support.

        * bootstrap: Symlink ..
        * argz.c lt__dirent.c lt__strl.c: .. these from the copies in
        libltdl.
        * Makefile.am: Add these to EXTRA_DIST, as well as the originals
        in libltdl/, in order to work with both old and newer Automake.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/Makefile.am,v
retrieving revision 1.157
diff -u -r1.157 Makefile.am
--- Makefile.am 23 Aug 2005 01:49:36 -0000      1.157
+++ Makefile.am 27 Aug 2005 18:37:02 -0000
@@ -335,6 +335,12 @@
 
 # %%% END libltdl/Makefile.am
 
+## workaround for Autoconf 2.59, Automake 1.9.6:
+## we include these files twice, because of missing LIBOBJDIR support.
+EXTRA_DIST += \
+       argz.c libltdl/argz.c \
+       lt__dirent.c libltdl/lt__dirent.c \
+       lt__strl.c libltdl/lt__strl.c
 
 ## -------------- ##
 ## Documentation. ##
Index: bootstrap
===================================================================
RCS file: /cvsroot/libtool/libtool/bootstrap,v
retrieving revision 1.65
diff -u -r1.65 bootstrap
--- bootstrap   23 Aug 2005 11:14:55 -0000      1.65
+++ bootstrap   27 Aug 2005 18:37:02 -0000
@@ -67,6 +67,13 @@
 # Delete stale files from previous libtool versions.
 rm -f acinclude.m4 libltdl/config.h
 
+# Workaround for missing LIBOBJDIR support in Autoconf 2.59, Automake 1.9.6:
+# Have symlinks of the libobj files in top source dir:
+for file in argz.c lt__dirent.c lt__strl.c; do
+  rm -f $file
+  $LN_S libltdl/$file $file
+done
+
 if test -z "$reconfdirs"; then
   reconfdirs=". libltdl `ls -1d tests/*demo tests/*demo[0-9]`"
 fi