From 4732e6e6b0a21c0010afca00ecdc09876e7c3e06 Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Fri, 30 Sep 2005 01:13:38 +0000 Subject: [PATCH] * tests/libtoolize.at: Add a new test to catch a regression I almost introduced with respect to copying macro files when AC_CONFIG_MACRO_DIR is shared with libltdl subproject. --- ChangeLog | 6 ++++ tests/libtoolize.at | 67 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 72 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 599d8375..06299d01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-09-30 Gary V. Vaughan + + * tests/libtoolize.at: Add a new test to catch a regression I + almost introduced with respect to copying macro files when + AC_CONFIG_MACRO_DIR is shared with libltdl subproject. + 2005-09-30 Gary V. Vaughan * tests/old-m4-iface.at: Start of a new test series for m4 diff --git a/tests/libtoolize.at b/tests/libtoolize.at index 37c4773f..b1d86378 100644 --- a/tests/libtoolize.at +++ b/tests/libtoolize.at @@ -23,7 +23,7 @@ AT_BANNER([Libtoolize operation.]) # ---------------- m4_define([_LT_CONFIGURE_AC], [AT_DATA([configure.ac], -[[AC_INIT([libtoolize-demo], ]]]AT_PACKAGE_VERSION[[[, ]]]AT_PACKAGE_BUGREPORT[[[) +[[AC_INIT([libtoolize-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[) AC_CONFIG_AUX_DIR([config]) AC_CONFIG_MACRO_DIR([m4]) LT_INIT @@ -278,5 +278,70 @@ libtoolize: `m4/ltversion.m4' is already up to date. LT_AT_CHECK_LIBTOOLIZE([--copy --install], 0, expout) +AT_CLEANUP + +## ---------------------------- ## +## Make sure ltdl.m4 is copied. ## +## ---------------------------- ## + +AT_SETUP([copy ltdl.m4 with shared macro directory]) + +AT_DATA([configure.ac], +[[AC_INIT([libtoolize-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[) +LT_CONFIG_LTDL_DIR([ltdl]) +AC_CONFIG_AUX_DIR([ltdl/config]) +AC_CONFIG_MACRO_DIR([ltdl/m4]) +LT_INIT +LT_WITH_LTDL +AC_OUTPUT +]]) + +AT_DATA(expout, +[[libtoolize: linking file `ltdl/COPYING.LIB' +libtoolize: linking file `ltdl/README' +libtoolize: linking file `ltdl/Makefile.am' +libtoolize: linking file `ltdl/configure.ac' +libtoolize: linking file `ltdl/aclocal.m4' +libtoolize: linking file `ltdl/Makefile.in' +libtoolize: linking file `ltdl/config-h.in' +libtoolize: linking file `ltdl/configure' +libtoolize: linking file `ltdl/argz_.h' +libtoolize: linking file `ltdl/argz.c' +libtoolize: linking file `ltdl/loaders/dld_link.c' +libtoolize: linking file `ltdl/loaders/dlopen.c' +libtoolize: linking file `ltdl/loaders/dyld.c' +libtoolize: linking file `ltdl/loaders/load_add_on.c' +libtoolize: linking file `ltdl/loaders/loadlibrary.c' +libtoolize: linking file `ltdl/loaders/shl_load.c' +libtoolize: linking file `ltdl/lt__dirent.c' +libtoolize: linking file `ltdl/lt__strl.c' +libtoolize: linking file `ltdl/libltdl/lt__alloc.h' +libtoolize: linking file `ltdl/libltdl/lt__dirent.h' +libtoolize: linking file `ltdl/libltdl/lt__glibc.h' +libtoolize: linking file `ltdl/libltdl/lt__private.h' +libtoolize: linking file `ltdl/libltdl/lt__strl.h' +libtoolize: linking file `ltdl/libltdl/lt_dlloader.h' +libtoolize: linking file `ltdl/libltdl/lt_error.h' +libtoolize: linking file `ltdl/libltdl/lt_system.h' +libtoolize: linking file `ltdl/libltdl/slist.h' +libtoolize: linking file `ltdl/loaders/preopen.c' +libtoolize: linking file `ltdl/lt__alloc.c' +libtoolize: linking file `ltdl/lt_dlloader.c' +libtoolize: linking file `ltdl/lt_error.c' +libtoolize: linking file `ltdl/ltdl.c' +libtoolize: linking file `ltdl/ltdl.h' +libtoolize: linking file `ltdl/slist.c' +libtoolize: putting files in AC_CONFIG_AUX_DIR, `ltdl/config'. +libtoolize: linking file `ltdl/config/ltmain.sh' +libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `ltdl/m4'. +libtoolize: linking file `ltdl/m4/libtool.m4' +libtoolize: linking file `ltdl/m4/ltdl.m4' +libtoolize: linking file `ltdl/m4/argz.m4' +libtoolize: linking file `ltdl/m4/ltoptions.m4' +libtoolize: linking file `ltdl/m4/ltsugar.m4' +libtoolize: linking file `ltdl/m4/ltversion.m4' +]]) + +LT_AT_CHECK_LIBTOOLIZE([--ltdl], 0, expout) AT_CLEANUP