From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Mon, 29 Aug 2005 13:58:07 +0000 (+0000)
Subject: Allow for portability with Autoconf 2.59, Automake 1.9.6,
X-Git-Tag: release-2-1b~546
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc5c0861d2d3386c889139539b5795ae07a89d80;p=thirdparty%2Flibtool.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index 528bfead9..141608e32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2005-08-29  Gary V. Vaughan <gary@gnu.org>,
+	    Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+	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.
+
 2005-08-29  Gary V. Vaughan  <gary@gnu.org>
 
 	* libltdl/m4/ltdl.m4 (LTDL_CONVENIENCE): Fix the comment to not
diff --git a/Makefile.am b/Makefile.am
index d1d37f850..44a39ce08 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -335,6 +335,15 @@ MOSTLYCLEANFILES += libltdl/argz.h \
 
 # %%% 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. ##
diff --git a/bootstrap b/bootstrap
index 822b1d1de..24b0fe5ca 100755
--- a/bootstrap
+++ b/bootstrap
@@ -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 @@ rm -rf `find . -path './{arch}' -prune -o \( -name autom4te.cache -o -name libto
 # 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
diff --git a/configure.ac b/configure.ac
index 73c32b985..0439a5681 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,6 +123,13 @@ AC_SUBST([M4SH], ['$(AUTOM4TE) --language=m4sh'])
 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. ##
 ## ------------------------------- ##