Re: autoreconf: Allow variable override

[Ralf Wildenhues]

Hi Tim,

* Tim Rice wrote on Tue, Sep 27, 2005 at 03:18:13AM CEST:
> On Mon, 26 Sep 2005, Tim Rice wrote:
> > 
> > CVS HEAD
> > 
> > Here is a patch to tests/defs.m4sh to fix the hard coded autoreconf.
> 
> Oops, missed one.  tests/testsuite.at needed tuning up too.

Applied like below (also exported AUTORECONF in the new testsuite).
Thank you!

Cheers,
Ralf

2005-09-27  Tim Rice  <address@hidden>

        * tests/defs.m4sh, tests/testsuite.at (PREPARE_TESTS)
        <AUTORECONF>: Allow variable override.

Index: tests/defs.m4sh
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/defs.m4sh,v
retrieving revision 1.14
diff -u -r1.14 defs.m4sh
--- tests/defs.m4sh     24 Aug 2005 13:39:51 -0000      1.14
+++ tests/defs.m4sh     27 Sep 2005 06:47:06 -0000
@@ -31,6 +31,7 @@
 m4_include([general.m4sh])
 
 : ${AUTOCONF="autoconf"}
+: ${AUTORECONF="autoreconf"}
 : ${LIBTOOL="./libtool"}
 
 # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -187,7 +188,7 @@
 
     func_msg "Configuring in $my_dir"
 
-    test -f "$my_testdir/configure" || autoreconf --force --install $my_testdir
+    test -f "$my_testdir/configure" || ${AUTORECONF} --force --install 
$my_testdir
     if test -f "$my_testdir/configure"; then
 
       eval func_msg $SHELL "$my_testdir/configure" $my_args
Index: tests/testsuite.at
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/testsuite.at,v
retrieving revision 1.19
diff -u -r1.19 testsuite.at
--- tests/testsuite.at  16 Sep 2005 08:33:24 -0000      1.19
+++ tests/testsuite.at  27 Sep 2005 06:47:06 -0000
@@ -23,7 +23,8 @@
 : ${LIBTOOL="${abs_top_builddir}/libtool"}
 : ${ACLOCAL=aclocal}
 : ${AUTOCONF=autoconf}
-export LIBTOOLIZE LIBTOOL ACLOCAL AUTOCONF
+: ${AUTORECONF=autoreconf}
+export LIBTOOLIZE LIBTOOL ACLOCAL AUTOCONF AUTORECONF
 eval `$LIBTOOL --config | grep ^EGREP=`
 eval `$LIBTOOL --config | $EGREP '^(host|host_os|build)='`
 m4_divert_pop([PREPARE_TESTS])dnl
@@ -48,7 +49,7 @@
 m4_define([LT_AT_BOOTSTRAP],
 [
 test -f ./ltmain.sh || LT_AT_LIBTOOLIZE([--copy])
-test -f ./configure || _lt_pkgdatadir="$abs_top_srcdir" autoreconf --force 
--verbose --install || exit 1
+test -f ./configure || _lt_pkgdatadir="$abs_top_srcdir" ${AUTORECONF} --force 
--verbose --install || exit 1
 test -f ./configure || exit 1
 ./configure
 ])