* tests/testsuite.at (LT_AT_BOOTSTRAP): Allow passing arguments to

configure.
* tests/old-m4-iface.at, tests/subproject.at: Use LT_AT_BOOTSTRAP.

diff --git a/ChangeLog b/ChangeLog
index 9bd3661992191f809b650a44de1f20496c3d0d48..72c62c922415dbb3a21048e003d14eea1f22b8db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-10  Gary V. Vaughan  <gary@gnu.org>
+
+       * tests/testsuite.at (LT_AT_BOOTSTRAP): Allow passing arguments to
+       configure.
+       * tests/old-m4-iface.at, tests/subproject.at: Use LT_AT_BOOTSTRAP.
+
 2005-11-09  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
        * libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS): Also set pic_flag.

diff --git a/tests/am-subdir.at b/tests/am-subdir.at
index ecbf4e7958ff87416b56f855b09de77410d560d0..f4b15d68a69324ebbbbc1badb8b09231cfbb0fbc 100644 (file)
--- a/tests/am-subdir.at
+++ b/tests/am-subdir.at
@@ -31,6 +31,7 @@ AT_DATA([[configure.ac]],
 [[AC_INIT([subdir-demo], ]]AT_PACKAGE_VERSION[[, ]]AT_PACKAGE_BUGREPORT[[)
 AM_INIT_AUTOMAKE([subdir-objects foreign])
 LT_INIT([win32-dll])
+AC_PROG_CC
 AM_PROG_CC_C_O
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
@@ -73,8 +74,8 @@ AT_DATA(expout,
 ** This is libsub **
 ]])
 
-LT_AT_BOOTSTRAP
-LT_AT_MAKE
+LT_AT_BOOTSTRAP([--copy], [], [ignore], [--add-missing])
+
 LT_AT_EXEC_CHECK([subdir/subdemo], 0, expout)
 
 AT_CLEANUP
@@ -91,6 +92,7 @@ LT_AT_TAG([CXX])
 AT_DATA([[configure.ac]],
 [[AC_INIT([subdir-demo], ]]AT_PACKAGE_VERSION[[, ]]AT_PACKAGE_BUGREPORT[[)
 AM_INIT_AUTOMAKE([subdir-objects foreign])
+AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_CXX
 AC_PROG_CXXCPP
@@ -148,8 +150,8 @@ AT_DATA([[subdir/sub.cxx]],
 int libsub::sub (void) { return 27; }
 ]])
 
-LT_AT_BOOTSTRAP
-LT_AT_MAKE
+LT_AT_BOOTSTRAP([--copy], [], [ignore], [--add-missing])
+
 LT_AT_EXEC_CHECK([subdir/subdemo], 0)
 
 AT_CLEANUP

diff --git a/tests/nonrecursive.at b/tests/nonrecursive.at
index d8df15a15ff7f5e33c22f090b015e57c8da1a3d4..ea530c89598c9f00a8ccf7b5c47b0cd0c0b7cde8 100644 (file)
--- a/tests/nonrecursive.at
+++ b/tests/nonrecursive.at
@@ -76,13 +76,7 @@ for file in argz.c lt__dirent.c lt__strl.c; do
   cp libltdl/$file $file
 done
 
-LT_AT_ACLOCAL([-I libltdl/m4])
-LT_AT_AUTOHEADER
-LT_AT_AUTOMAKE([--add-missing --copy])
-LT_AT_AUTOCONF
-
-LT_AT_CONFIGURE
-LT_AT_MAKE
+LT_AT_BOOTSTRAP([ignore], [-I libltdl/m4], [ignore], [--add-missing --copy])
 
 AT_CHECK([test -f libltdl/libltdlc.la])
 
@@ -105,13 +99,7 @@ for file in argz.c lt__dirent.c lt__strl.c; do
   cp libltdl/$file $file
 done
 
-LT_AT_ACLOCAL([-I libltdl/m4])
-LT_AT_AUTOHEADER
-LT_AT_AUTOMAKE([--add-missing --copy])
-LT_AT_AUTOCONF
-
-LT_AT_CONFIGURE
-LT_AT_MAKE
+LT_AT_BOOTSTRAP([ignore], [-I libltdl/m4], [ignore], [--add-missing --copy])
 
 AT_CHECK([test -f libltdl/libltdlc.la])
 
@@ -136,13 +124,8 @@ for file in argz.c lt__dirent.c lt__strl.c; do
   cp libltdl/$file $file
 done
 
-LT_AT_ACLOCAL([-I libltdl/m4])
-LT_AT_AUTOHEADER
-LT_AT_AUTOMAKE([--add-missing --copy])
-LT_AT_AUTOCONF
-
-LT_AT_CONFIGURE([--enable-ltdl-install --prefix=$prefix])
-LT_AT_MAKE([all install])
+LT_AT_BOOTSTRAP([ignore], [-I libltdl/m4], [ignore], [--add-missing --copy],
+       [], [--enable-ltdl-install --prefix=$prefix], [all install])
 
 AT_CHECK([test -f $prefix/lib/libltdl.la])
 AT_CHECK([test -f $prefix/include/ltdl.h])

diff --git a/tests/old-m4-iface.at b/tests/old-m4-iface.at
index 3354df29f061f5ed5948baf5c375966b5a1c413c..1e4a7afe8c0806d18d04a8c5354d0f616c30f307 100644 (file)
--- a/tests/old-m4-iface.at
+++ b/tests/old-m4-iface.at
@@ -71,14 +71,11 @@ LT_AT_LIBTOOLIZE([--install])
 
 # This is slightly bogus, since only libtool.m4 was required in aclocal.m4
 # with libtool-1.5x...
-test -f aclocal.m4 \
-    || cat "$macrodir/libtool.m4" "$macrodir/ltoptions.m4" \
-       "$macrodir/ltsugar.m4" "$macrodir/ltversion.m4" > aclocal.m4 \
-    || exit 1
+AT_CHECK([test -f aclocal.m4 ||
+  cat "$macrodir/libtool.m4" "$macrodir/ltoptions.m4" \
+      "$macrodir/ltsugar.m4" "$macrodir/ltversion.m4" > aclocal.m4])
 
-LT_AT_AUTOCONF([--force])
-LT_AT_CONFIGURE
-LT_AT_MAKE
+LT_AT_BOOTSTRAP([ignore], [ignore], [ignore], [ignore], [--force])
 
 LT_AT_EXEC_CHECK([./old], 0, [Hello, World!])
 
@@ -133,11 +130,8 @@ ltdldemo@EXEEXT@: main.@OBJEXT@
        $(LTCOMPILE) -c -o $@ $<
 ]])
 
-LT_AT_LIBTOOLIZE([--ltdl --install])
-LT_AT_ACLOCAL([-I libltdl/m4])
-LT_AT_AUTOCONF([--force])
-LT_AT_CONFIGURE
-LT_AT_MAKE
+LT_AT_BOOTSTRAP([--ltdl --install], [-I libltdl/m4], [ignore], [ignore],
+       [--force])
 
 LT_AT_EXEC_CHECK([./ltdldemo], 0, [ignore])
 

diff --git a/tests/subproject.at b/tests/subproject.at
index 81994a914f337fb31ebadbcb4758254096dc0cf0..782d06dad55836e8c81976a29a8ea40c5cffc45b 100644 (file)
--- a/tests/subproject.at
+++ b/tests/subproject.at
@@ -52,13 +52,7 @@ AT_SETUP([compiling softlinked libltdl])
 
 _LTDL_SETUP
 
-LT_AT_LIBTOOLIZE([--ltdl])
-LT_AT_ACLOCAL([-I sub/ltdl/m4])
-LT_AT_AUTOMAKE([--add-missing --copy])
-LT_AT_AUTOCONF
-
-LT_AT_CONFIGURE
-LT_AT_MAKE
+LT_AT_BOOTSTRAP([--ltdl], [-I sub/ltdl/m4], [ignore], [--add-missing --copy])
 
 AT_CHECK([test -f sub/ltdl/libltdlc.la])
 
@@ -73,13 +67,8 @@ AT_SETUP([compiling copied libltdl])
 
 _LTDL_SETUP
 
-LT_AT_LIBTOOLIZE([--copy --ltdl])
-LT_AT_ACLOCAL([-I sub/ltdl/m4])
-LT_AT_AUTOMAKE([--add-missing --copy])
-LT_AT_AUTOCONF
-
-LT_AT_CONFIGURE
-LT_AT_MAKE
+LT_AT_BOOTSTRAP([--copy --ltdl], [-I sub/ltdl/m4], [ignore],
+       [--add-missing --copy])
 
 AT_CHECK([test -f sub/ltdl/libltdlc.la])
 
@@ -96,13 +85,9 @@ prefix=`pwd`/_inst
 
 _LTDL_SETUP
 
-LT_AT_LIBTOOLIZE([--copy --ltdl])
-LT_AT_ACLOCAL([-I sub/ltdl/m4])
-LT_AT_AUTOMAKE([--add-missing --copy])
-LT_AT_AUTOCONF
-
-LT_AT_CONFIGURE([--enable-ltdl-install --prefix=$prefix])
-LT_AT_MAKE([all install])
+LT_AT_BOOTSTRAP([--copy --ltdl], [-I sub/ltdl/m4], [ignore],
+       [--add-missing --copy], [], [--enable-ltdl-install --prefix=$prefix],
+       [all install])
 
 AT_CHECK([test -f $prefix/lib/libltdl.la])
 AT_CHECK([test -f $prefix/include/ltdl.h])

diff --git a/tests/testsuite.at b/tests/testsuite.at
index 289d37b8e155b30c1fb3e77396f02a4d7f0bd463..21108f71d5cbaeb530bdf0309e0abca0aba7f5b3 100644 (file)
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -105,12 +105,17 @@ m4_define([LT_AT_MAKE],
 ])
 
 
-# LT_AT_BOOTSTRAP
-# ---------------
+# LT_AT_BOOTSTRAP([LIBTOOLIZE-ARGS], [ACLOCAL-ARGS], [AUTOHEADER-ARGS],
+#      [AUTOMAKE-ARGS], [AUTOCONF-ARGS], [CONFIGURE-ARGS], [MAKE-ARGS])
+# ----------------------------------------------------------------------
 m4_define([LT_AT_BOOTSTRAP],
-[LT_AT_LIBTOOLIZE([--copy])
-LT_AT_AUTORECONF([--force --verbose --install])
-LT_AT_CONFIGURE
+[m4_if([$1], [ignore], [], [LT_AT_LIBTOOLIZE([$1])])
+m4_if([$2], [ignore], [], [LT_AT_ACLOCAL([$2])])
+m4_if([$3], [ignore], [], [LT_AT_AUTOHEADER([$3])])
+m4_if([$4], [ignore], [], [LT_AT_AUTOMAKE([$4])])
+m4_if([$5], [ignore], [], [LT_AT_AUTOCONF([$5])])
+m4_if([$6], [ignore], [], [LT_AT_CONFIGURE([$6])])
+m4_if([$7], [ignore], [], [LT_AT_MAKE([$7])])
 ])