From: Gary V. Vaughan Date: Tue, 8 Jan 2008 05:07:41 +0000 (+0000) Subject: * tests/configure-iface.at, tests/nonrecursive.at, X-Git-Tag: release-2-1b~45 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e67083cffc58dd3031a5812d3c2d6b9b69a1155;p=thirdparty%2Flibtool.git * tests/configure-iface.at, tests/nonrecursive.at, tests/recursive.at, tests/subproject.at (_LTDL_SETUP): Renamed to _LT_AT_LTDL_SETUP to avoid a nameclash with libltdl/m4/ltoptions.m4:_LTDL_SETUP from yesterday's patch. Reported by Ralf Wildenhues --- diff --git a/ChangeLog b/ChangeLog index 758b43cbc..8f72f4b5c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-01-08 Gary V. Vaughan + + * tests/configure-iface.at, tests/nonrecursive.at, + tests/recursive.at, tests/subproject.at (_LTDL_SETUP): + Renamed to _LT_AT_LTDL_SETUP to avoid a nameclash with + libltdl/m4/ltoptions.m4:_LTDL_SETUP from yesterday's patch. + Reported by Ralf Wildenhues + 2008-01-07 Ralf Wildenhues * tests/runpath-in-lalib.at (Runpath in libtool library files): @@ -47,11 +55,11 @@ expanded before LTDL_INIT, and be sure to parse caller options. * configure.ac: Call directly into internal _LTDL_SETUP macro. * libtoolize.m4sh (func_scan_files): Ltdl mode argument moved from - LT_CONFIG_LTDL_DIR to LT_INIT. + LT_CONFIG_LTDL_DIR to LTDL_INIT. * tests/nonrecursive.at, tests/recursive.at: Use new interfaces. * tests/configure-iface.at: Test it. * Makefile.am (TESTSUITE_AT): Add configure-iface.at. - * doc/libtool.texi (Distributing libltdl): Document improved. + * doc/libtool.texi (Distributing libltdl): Document improved LTDL_INIT interfaces. * NEWS: Updated. diff --git a/tests/configure-iface.at b/tests/configure-iface.at index 03ce1b0d6..42f1eb7c3 100644 --- a/tests/configure-iface.at +++ b/tests/configure-iface.at @@ -24,9 +24,9 @@ AT_BANNER([configure interface to libltdl.]) -# _LTDL_SETUP -# ----------- -m4_pushdef([_LTDL_SETUP], +# _LT_AT_LTDL_SETUP +# ----------------- +m4_pushdef([_LT_AT_LTDL_SETUP], [AT_DATA([main.c], [[#include #include @@ -92,7 +92,7 @@ int f (void) { return 5150; } AT_DATA([expout], [[5150 ]]) -])# _LTDL_SETUP +])# _LT_AT_LTDL_SETUP ## -------------------- ## @@ -102,7 +102,7 @@ AT_DATA([expout], AT_SETUP([installable libltdl]) AT_KEYWORDS([libltdl]) -_LTDL_SETUP +_LT_AT_LTDL_SETUP AT_DATA([configure.ac], [[AC_INIT([installable-ltdl-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[) @@ -169,7 +169,7 @@ done AT_CHECK([test -f $prefix/lib/libltdl.la]) AT_CHECK([test -f $prefix/include/ltdl.h]) -_LTDL_SETUP +_LT_AT_LTDL_SETUP AT_DATA([configure.ac], [[AC_INIT([configure-iface-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[) @@ -218,7 +218,7 @@ AT_CLEANUP AT_SETUP([--with-included-ltdl]) AT_KEYWORDS([libltdl]) -_LTDL_SETUP +_LT_AT_LTDL_SETUP AT_DATA([configure.ac], [[AC_INIT([configure-iface-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[) @@ -264,4 +264,4 @@ LT_AT_NOINST_EXEC_CHECK([./main], [-dlopen libmodule.la], [], [expout], []) AT_CLEANUP dnl Be careful not to let the definition leak into other tests -m4_popdef([_LTDL_SETUP]) +m4_popdef([_LT_AT_LTDL_SETUP]) diff --git a/tests/nonrecursive.at b/tests/nonrecursive.at index 39d3ed2e9..5f84cb083 100644 --- a/tests/nonrecursive.at +++ b/tests/nonrecursive.at @@ -25,9 +25,9 @@ AT_BANNER([Nonrecursive Automake Libltdl.]) -# _LTDL_SETUP -# ----------- -m4_pushdef([_LTDL_SETUP], +# _LT_AT_LTDL_SETUP +# ----------------- +m4_pushdef([_LT_AT_LTDL_SETUP], [AT_DATA([configure.ac], [[AC_INIT([subdirectory-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[) LT_CONFIG_LTDL_DIR([ltdl]) @@ -69,7 +69,7 @@ foo_la_SOURCES = foo.c ]]) echo 'int dummy = 0;' > foo.c -])# _LTDL_SETUP +])# _LT_AT_LTDL_SETUP ## ------------------------ ## ## Softlinked libltdl tree. ## @@ -77,7 +77,7 @@ echo 'int dummy = 0;' > foo.c AT_SETUP([compiling softlinked libltdl]) -_LTDL_SETUP +_LT_AT_LTDL_SETUP LT_AT_LIBTOOLIZE([--ltdl]) AT_CHECK([if test -f ltdl/configure.ac; then false; fi]) @@ -101,7 +101,7 @@ AT_CLEANUP AT_SETUP([compiling copied libltdl]) -_LTDL_SETUP +_LT_AT_LTDL_SETUP LT_AT_LIBTOOLIZE([--copy --ltdl]) AT_CHECK([if test -f ltdl/configure.ac; then false; fi]) @@ -125,7 +125,7 @@ AT_CLEANUP AT_SETUP([installable libltdl]) -_LTDL_SETUP +_LT_AT_LTDL_SETUP prefix=`pwd`/_inst @@ -146,4 +146,4 @@ AT_CHECK([test -f $prefix/include/ltdl.h]) AT_CLEANUP dnl Be careful not to let the definition leak into other tests -m4_popdef([_LTDL_SETUP]) +m4_popdef([_LT_AT_LTDL_SETUP]) diff --git a/tests/recursive.at b/tests/recursive.at index 21c2e089a..b45f48835 100644 --- a/tests/recursive.at +++ b/tests/recursive.at @@ -24,9 +24,9 @@ AT_BANNER([Recursive Automake Libltdl.]) -# _LTDL_SETUP -# ----------- -m4_pushdef([_LTDL_SETUP], +# _LT_AT_LTDL_SETUP +# ----------------- +m4_pushdef([_LT_AT_LTDL_SETUP], [AT_DATA([configure.ac], [[AC_INIT([subdirectory-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[) LT_CONFIG_LTDL_DIR([ltdl]) @@ -51,7 +51,7 @@ foo_la_SOURCES = foo.c ]]) echo 'int dummy = 0;' > foo.c -])# _LTDL_SETUP +])# _LT_AT_LTDL_SETUP ## ------------------------ ## ## Softlinked libltdl tree. ## @@ -59,7 +59,7 @@ echo 'int dummy = 0;' > foo.c AT_SETUP([compiling softlinked libltdl]) -_LTDL_SETUP +_LT_AT_LTDL_SETUP LT_AT_LIBTOOLIZE([--ltdl]) AT_CHECK([if test -f ltdl/configure.ac; then false; fi]) @@ -79,7 +79,7 @@ AT_CLEANUP AT_SETUP([compiling copied libltdl]) -_LTDL_SETUP +_LT_AT_LTDL_SETUP LT_AT_LIBTOOLIZE([--debug --copy --ltdl]) AT_CHECK([if test -f ltdl/configure.ac; then false; fi]) @@ -99,7 +99,7 @@ AT_CLEANUP AT_SETUP([installable libltdl]) -_LTDL_SETUP +_LT_AT_LTDL_SETUP prefix=`pwd`/_inst @@ -116,4 +116,4 @@ AT_CHECK([test -f $prefix/include/ltdl.h]) AT_CLEANUP dnl Be careful not to let the definition leak into other tests -m4_popdef([_LTDL_SETUP]) +m4_popdef([_LT_AT_LTDL_SETUP]) diff --git a/tests/subproject.at b/tests/subproject.at index 8f18813c0..60f2571f5 100644 --- a/tests/subproject.at +++ b/tests/subproject.at @@ -24,9 +24,9 @@ AT_BANNER([Subproject Libltdl.]) -# _LTDL_SETUP -# ----------- -m4_pushdef([_LTDL_SETUP], +# _LT_AT_LTDL_SETUP +# ----------------- +m4_pushdef([_LT_AT_LTDL_SETUP], [AT_DATA([configure.ac], [[AC_INIT([subproject-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[) LT_CONFIG_LTDL_DIR([sub/ltdl]) @@ -48,7 +48,7 @@ foo_la_LDFLAGS = -module -avoid-version ]]) echo 'int dummy = 0;' > foo.c -])# _LTDL_SETUP +])# _LT_AT_LTDL_SETUP ## ------------------------ ## ## Softlinked libltdl tree. ## @@ -56,7 +56,7 @@ echo 'int dummy = 0;' > foo.c AT_SETUP([compiling softlinked libltdl]) -_LTDL_SETUP +_LT_AT_LTDL_SETUP LT_AT_BOOTSTRAP([--ltdl], [-I sub/ltdl/m4], [ignore], [--add-missing --copy], [], [], [all $tst_dist]) @@ -72,7 +72,7 @@ AT_CLEANUP AT_SETUP([compiling copied libltdl]) -_LTDL_SETUP +_LT_AT_LTDL_SETUP LT_AT_BOOTSTRAP([--copy --ltdl], [-I sub/ltdl/m4], [ignore], [--add-missing --copy], [], [], [all $tst_dist]) @@ -90,7 +90,7 @@ AT_SETUP([installable libltdl]) prefix=`pwd`/_inst -_LTDL_SETUP +_LT_AT_LTDL_SETUP LT_AT_BOOTSTRAP([--copy --ltdl], [-I sub/ltdl/m4], [ignore], [--add-missing --copy], [], [--enable-ltdl-install --prefix=$prefix], @@ -119,4 +119,4 @@ LT_AT_EXEC_CHECK([./ltdldemo], 0, [ignore]) AT_CLEANUP dnl Be careful not to let the definition leak into other tests -m4_popdef([_LTDL_SETUP]) +m4_popdef([_LT_AT_LTDL_SETUP])