* tests/subproject.at: Commit the right file this time.

diff --git a/ChangeLog b/ChangeLog
index 7fbea79fddffa155f20fe68060f929c813a824e5..48091f53f0c0e7c3e26bbabccbaaa29858e8a169 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-05  Gary V. Vaughan  <gary@gnu.org>
+
+       * tests/subproject.at: Commit the right file this time.
+
 2005-10-05  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * libltdl/m4/libtool.m4 (_LT_LANG_CXX_CONFIG): Fix m4 quoting

diff --git a/tests/subproject.at b/tests/subproject.at
index f4fcacc0c727f114cae32ae88fa2f9f72d32e7d4..4709c7080558fa4861b2f91e50330256c29c6b21 100644 (file)
--- a/tests/subproject.at
+++ b/tests/subproject.at
@@ -19,8 +19,8 @@
 
 AT_BANNER([Subproject Libltdl.])
 
-# _LTDL_SETUP([CONFIGURE-OPTIONS], [LIBTOOLIZE-OPTIONS])
-# ------------------------------------------------------
+# _LTDL_SETUP
+# -----------
 m4_define([_LTDL_SETUP],
 [AT_DATA([configure.ac],
 [[AC_INIT([subproject-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
@@ -51,7 +51,9 @@ touch foo.c
 AT_SETUP([compiling softlinked libltdl])
 
 _LTDL_SETUP
-LT_AT_BOOTSTRAP
+LT_AT_LIBTOOLIZE([--ltdl])
+LT_AT_AUTORECONF([--force --verbose --install])
+LT_AT_CONFIGURE
 LT_AT_MAKE
 
 AT_CHECK([test -f sub/ltdl/libltdlc.la])
@@ -66,7 +68,9 @@ AT_CLEANUP
 AT_SETUP([compiling copied libltdl])
 
 _LTDL_SETUP
-LT_AT_BOOTSTRAP
+LT_AT_LIBTOOLIZE([--copy --ltdl])
+LT_AT_AUTORECONF([--force --verbose --install])
+LT_AT_CONFIGURE
 LT_AT_MAKE
 
 AT_CHECK([test -f sub/ltdl/libltdlc.la])
@@ -83,7 +87,7 @@ AT_SETUP([installable libltdl])
 prefix=`pwd`/_inst
 
 _LTDL_SETUP
-LT_AT_LIBTOOLIZE([--copy])
+LT_AT_LIBTOOLIZE([--copy --ltdl])
 LT_AT_AUTORECONF([--force --verbose --install])
 LT_AT_CONFIGURE([--enable-ltdl-install --prefix=$prefix])
 LT_AT_MAKE([all install])
@@ -184,7 +188,7 @@ module.lo: $(LIBTOOL) module.c
        $(LTCOMPILE) -c module.c
 ]])
 
-LT_AT_LIBTOOLIZE([--copy])
+LT_AT_LIBTOOLIZE([--copy --ltdl=sub/ltdl])
 LT_AT_MAKE([], [CC="$CC" LIBTOOLFLAGS="$LIBTOOLFLAGS" CPPFLAGS="$CPPFLAGS"  \
      CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" SHELL="$SHELL" MAKE="${MAKE-make}" \
      CONFIGURE_OPTIONS="$configure_options"])