From 37bff2141f4bc15f0a3b355cf323d9407b0f78a2 Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Wed, 5 Oct 2005 16:45:09 +0000 Subject: [PATCH] * tests/subproject.at: Commit the right file this time. --- ChangeLog | 4 ++++ tests/subproject.at | 16 ++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7fbea79fd..48091f53f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-10-05 Gary V. Vaughan + + * tests/subproject.at: Commit the right file this time. + 2005-10-05 Ralf Wildenhues * libltdl/m4/libtool.m4 (_LT_LANG_CXX_CONFIG): Fix m4 quoting diff --git a/tests/subproject.at b/tests/subproject.at index f4fcacc0c..4709c7080 100644 --- 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"]) -- 2.47.3