From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sat, 25 Mar 2006 11:12:46 +0000 (+0000)
Subject: * bootstrap: Enable `WORKING_LIBOBJ_SUPPORT' if we detect
X-Git-Tag: release-2-1b~305
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e27eeb53ddf0bdc640e2ac5b809215cd153ca8f;p=thirdparty%2Flibtool.git

* bootstrap: Enable `WORKING_LIBOBJ_SUPPORT' if we detect
Autoconf-2.60+ and Automake-1.10+, or CVS versions.
---

diff --git a/ChangeLog b/ChangeLog
index c2a0ad980..ed3a0f3cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-03-25  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	* bootstrap: Enable `WORKING_LIBOBJ_SUPPORT' if we detect
+	Autoconf-2.60+ and Automake-1.10+, or CVS versions.
+
 	* libltdl/m4/argz.m4 (gl_FUNC_ARGZ): Sync with gnulib:  If we
 	define `error_t', also define `__error_t_defined', so argp.h
 	will not typedef the former.
diff --git a/bootstrap b/bootstrap
index f5f83c62a..1299683a6 100755
--- a/bootstrap
+++ b/bootstrap
@@ -27,6 +27,8 @@
 SHELL=${CONFIG_SHELL-/bin/sh}
 export SHELL
 : ${AUTORECONF=autoreconf}
+: ${AUTOCONF=autoconf}
+: ${AUTOMAKE=automake}
 : ${AUTOM4TE=autom4te}
 : ${MAKE=make}
 : ${GREP=grep}
@@ -89,6 +91,13 @@ 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.
+case `($AUTOCONF --version) 2>/dev/null` in
+  *\ 2.[5-9][0-9]* | *\ [3-9].[0-9]*)
+  case `($AUTOMAKE --version) 2>/dev/null` in
+    *\ 1.1[0-9]* | *\ [2-9].[0-9]*)
+      WORKING_LIBOBJ_SUPPORT=: ;;
+  esac ;;
+esac
 for file in argz.c lt__dirent.c lt__strl.c; do
   rm -f $file
   $WORKING_LIBOBJ_SUPPORT || $LN_S libltdl/$file $file