Re: HEAD: workaround for released autotools

[Ralf Wildenhues]

Hi Gary,

* Gary V. Vaughan wrote on Mon, Aug 29, 2005 at 02:26:16PM CEST:
> On 29 Aug 2005, at 12:53, Ralf Wildenhues wrote:
> >
> >But you can't expect plain "configure" without options to work.
> >And I test on real-world systems where this is true.
> 
> ACK.  We run plain configure in our test/*demo tests, and some of our  
> new autotest btw...

No, we don't.  We use TESTS_ENVIRONMENT to export all the important
variables.  And the old test suite was specifically designed to
stresstest some of the configure switches that could not be passed in
environment variables, like --enable-shared --disable-static.

> >>If you really hate this patch, then we can apply yours instead.  I'd
> >>still like some method of being able to make the 2.0 release without
> >>the  duplicate files if we have the necessary autotool patches in
> >>place at bootstrap  time though.  Maybe an environment variable?
> >
> >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?

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 12:41:33 -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 12:41:33 -0000
@@ -67,6 +67,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:
+true && sublibobjs_supported=yes
+for file in argz.c lt__dirent.c lt__strl.c; do
+  rm -f $file
+  test x"${sublibobjs_supported-no}" = xno && $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 12:41:33 -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 enabled])
+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. ##
 ## ------------------------------- ##