FYI: HEAD: workaround for released autotools

[Ralf Wildenhues]

* Gary V. Vaughan wrote on Mon, Aug 29, 2005 at 03:39:04PM CEST:
> On 29 Aug 2005, at 13:53, Ralf Wildenhues wrote:
> >* Gary V. Vaughan wrote on Mon, Aug 29, 2005 at 02:26:16PM CEST:
> >>On 29 Aug 2005, at 12:53, Ralf Wildenhues wrote:
> >>>
> >>>That would be fine with me.  Or a commandline switch for  
> >>>`bootstrap', FWIW.
> >>
> >>K.  Can you add that (either/or) and commit your original patch  
> >>please?
> >
> >OK like this?

Darn, I managed to type ":r!cvs diff" before I saved the final version
in the other buffer.  :-/

> >        * bootstrap: Unless environment variable  
> >WORKING_LIBOBJS_SUPPORT
> 
> You forgot to implement this part.

> >+# Have symlinks of the libobj files in top source dir:
> >+true && sublibobjs_supported=yes
> 
>   ^^^^^ ???

Pretty funny, eh?  Thanks for checking!  (Could've pretended that I did
this on purpose to see whether someone reads my patches..)

I have committed this real patch below to HEAD.  

BTW, I noticed that "make distcheck" really does find out when libltdl
files are not installed with properly ordered time stamps -- since the
source tree is readonly then, new tests 14-17 fail aclocal execution.
Nice work!

Cheers,
Ralf

2005-08-29  Gary V. Vaughan <address@hidden>,
            Ralf Wildenhues <address@hidden>

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

        * bootstrap: Unless environment variable WORKING_LIBOBJS_SUPPORT
        is set to true aka `:', symlink ..
        * argz.c lt__dirent.c lt__strl.c: .. these from the copies in
        libltdl.
        * configure.ac (SUBDIR_LIBOBJS): Automake conditional, set if
        bootstrap didn't make the extra copies of libobj sources in
        top srcdir...
        * Makefile.am: Add these to EXTRA_DIST if SUBDIR_OBJS is not set,
        as well as the originals in libltdl/, in order to work when
        bootstrapped both with old and newer Automake/Autoconf.

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 29 Aug 2005 13:48:21 -0000
@@ -335,6 +336,15 @@
 
 # %%% END libltdl/Makefile.am
 
+if ! SUBDIR_LIBOBJS
+## 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
+endif
+
 
 ## -------------- ##
 ## 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   29 Aug 2005 13:48:21 -0000
@@ -33,6 +33,7 @@
 : ${SED=sed}
 : ${LN_S='ln -s'}
 : ${MAKEINFO=makeinfo}
+: ${WORKING_LIBOBJ_SUPPORT=false}
 
 test -f ./configure.ac || {
   echo "bootstrap: can't find ./configure.ac, please rerun from top_srcdir"
@@ -67,6 +68,14 @@
 # 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.
+# Set WORKING_LIBOBJ_SUPPORT=: when calling bootstrap if you have fixed tools.
+for file in argz.c lt__dirent.c lt__strl.c; do
+  rm -f $file
+  $WORKING_LIBOBJ_SUPPORT || $LN_S libltdl/$file $file
+done
+
 if test -z "$reconfdirs"; then
   reconfdirs=". libltdl `ls -1d tests/*demo tests/*demo[0-9]`"
 fi
Index: configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/configure.ac,v
retrieving revision 1.71
diff -u -r1.71 configure.ac
--- configure.ac        23 Aug 2005 01:49:36 -0000      1.71
+++ configure.ac        29 Aug 2005 13:48:21 -0000
@@ -123,6 +123,13 @@
 dnl Make sure config.status is regenerated when the version timestamp changes
 AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/stamp-vcl'])
 
+dnl automake-1.9.x or autoconf-2.59 don't support subdir libobjs
+AC_MSG_CHECKING([whether subdir libobjs are useable])
+test -f $srcdir/argz.c || sublibobjs_supported=yes
+AM_CONDITIONAL([SUBDIR_LIBOBJS], test x"${sublibobjs_supported-no}" != xno)
+AC_MSG_RESULT([${sublibobjs_supported-no}])
+
+
 ## ------------------------------- ##
 ## Libtool specific configuration. ##
 ## ------------------------------- ##