Re: autotools versions and WORKING_LIBOBJ_SUPPORT

[Ralf Wildenhues]

Hi Eric,

* Eric Blake wrote on Wed, Mar 22, 2006 at 05:40:23AM CET:
> According to Ralf Wildenhues on 3/21/2006 1:07 PM:
> > 
> > +case `($AUTOCONF --version) 2>/dev/null` in
> > +  *\ 2.[5-9][0-9]* | *\ [3-9].[0-9]*)
> 
> Typo - this makes the cutoff point 2.50+ instead of 2.60+ as advertised...
> 
> > +  case `($AUTOMAKE --version) 2>/dev/null` in
> > +    *\ 1.1[0-9]* | *\ [2-9].[0-9]*)
> 
> And what if we ever get to automake 1.20 before 2.0?

D'oh, twice.

How about this?  I think we can safely assume users of the CVS versions
will have updated as well (saves me some typing anyway..).

Cheers,
Ralf

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

Index: bootstrap
===================================================================
RCS file: /cvsroot/libtool/libtool/bootstrap,v
retrieving revision 1.76
diff -u -r1.76 bootstrap
--- bootstrap   23 Jan 2006 18:33:57 -0000      1.76
+++ bootstrap   22 Mar 2006 07:42:26 -0000
@@ -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 @@
 # 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.59[c-z]* | *\ 2.[6-9][0-9]* | *\ [3-9].[0-9]*)
+  case `($AUTOMAKE --version) 2>/dev/null` in
+    *\ 1.9[a-z]* | *\ 1.1[0-9]* | *\ 1.[2-9][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