bug#8104: automake suggests use of AC_PROG_LIBTOOL, this has been replaced by LT_INIT

[Stefano Lattarini]

On Saturday 26 February 2011, Ralf Wildenhues wrote:
> * Stefano Lattarini wrote on Sat, Feb 26, 2011 at 02:08:39PM CET:
> > BTW, such kind of checks would be much easier to perform with Paolo's
> > pending patch for ACLOCAL_PATH support in place; pointer:
> >  <http://lists.gnu.org/archive/html/automake-patches/2010-11/msg00089.html>
> 
> Hmmyes, we have a lot of old pending stuff unfortunately ...
> 
> > On Saturday 26 February 2011, Ralf Wildenhues wrote:
> > > * Stefano Lattarini wrote on Thu, Feb 24, 2011 at 10:45:11AM CET:
> > > LT_PREREQ has been introduced in 1.9b only.  Also, I
> > > think that if the LT_PREREQ check fails, it will fail already
> > > at aclocal run time,
> > >
> > Oops, I dind't think of that.
> > 
> > > but I am not sure of that.
> > >
> > Better play safe anyway IMHO.  What about the following squash-in?
> 
> Well, not using LT_PREREQ seems like another step back: situations like
> this is what LT_PREREQ was designed for.  How about something like this?
> 
>   m4_ifdef([LT_PREREQ],
>     [LT_PREREQ([2.0])],
>     [m4_fatal([Libtool version too old], [63])])
> 
> (untested, sorry)
> 
Fine with me.  This is the additional squash-in -- on the top of the old
one, since I had already commited that locally :-(

-*-*-

diff --git a/tests/ltinit.test b/tests/ltinit.test
index 288a186..8517009 100755
--- a/tests/ltinit.test
+++ b/tests/ltinit.test
@@ -25,6 +25,10 @@ set -e
 
 cat >>configure.in <<'END'
 AC_PROG_CC
+# Older libtool versions don't define LT_PREREQ :-(
+m4_ifdef([LT_PREREQ],
+    [LT_PREREQ([2.0])],
+    [m4_fatal([Libtool version too old], [63])])
 LT_INIT([dlopen])
 AC_OUTPUT
 END
@@ -42,10 +46,9 @@ END
 
 libtoolize
 $ACLOCAL
-$AUTOCONF
 # Skip if older libtool (pre-2.0) is used.
-$EGREP '^LT_INIT' configure && Exit 77
-
+$AUTOCONF || { if $? -eq 63; then Exit 77; else Exit 1; fi; }
+$EGREP 'LT_(INIT|PREREQ)' configure && Exit 1 # Sanity check.
 $AUTOMAKE -a
 
 cwd=`pwd`

-*-*-

I will push in 72 hours if there are no further objections.

Thanks,
  Stefano