From: Gary V. Vaughan Date: Mon, 7 Nov 2005 14:18:15 +0000 (+0000) Subject: Support 'recursive' mode for building libltdl: Automake will X-Git-Tag: release-2-1b~423 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=746e5a476a2f6bb203c155739dfe681f9fd2ca69;p=thirdparty%2Flibtool.git Support 'recursive' mode for building libltdl: Automake will recursively descend into the libltdl directory, and use libltdl's Makefile.am code to build libltdl: * ltdl.m4 (LT_CONFIG_LTDL_DIR): Don't barf on 'recursive' mode for 2nd argument. (_LTDL_MODE_DISPATCH): Handle recursive mode. --- diff --git a/ChangeLog b/ChangeLog index b47312e90..31763c38a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,19 +1,22 @@ 2005-11-07 Gary V. Vaughan + Support 'recursive' mode for building libltdl: Automake will + recursively descend into the libltdl directory, and use libltdl's + Makefile.am code to build libltdl: + * ltdl.m4 (LT_CONFIG_LTDL_DIR): Don't barf on 'recursive' mode + for 2nd argument. + (_LTDL_MODE_DISPATCH): Handle recursive mode. + * tests/recursive.at: New tests for libltdl as a subdirectory, configured and compiled from the toplevel project using a recursive make.. * tests/testsuite.at: Use it. * Makefile.am (TESTSUITE_AT): Depend on it. -2005-11-07 Gary V. Vaughan - * libltdl/m4/ltdl.m4 (LTDL_INIT): Don't force running AC_CONFIG_HEADERS for subproject ltdl. * tests/old-m4-iface.at, tests/subproject.at: Remove workaround. -2005-11-07 Gary V. Vaughan - * libltdl/m4/ltdl.m4 (LT_CONFIG_LTDL_DIR): Add LTDL-MODE argument. * configure.ac: Use it. diff --git a/libltdl/m4/ltdl.m4 b/libltdl/m4/ltdl.m4 index 529fd7c61..625ac537f 100644 --- a/libltdl/m4/ltdl.m4 +++ b/libltdl/m4/ltdl.m4 @@ -34,7 +34,7 @@ m4_popdef([_ARG_DIR]) dnl If not otherwise defined, default to the 1.5.x compatible subproject mode: m4_if(_LTDL_MODE, [], [m4_define([_LTDL_MODE], m4_default([$2], [subproject])) - m4_if([-1], [m4_bregexp(_LTDL_MODE, [\(subproject\|nonrecursive\)])], + m4_if([-1], [m4_bregexp(_LTDL_MODE, [\(subproject\|\(non\)?recursive\)])], [m4_fatal([unknown libltdl mode: ]_LTDL_MODE)])]) ])# LT_CONFIG_LTDL_DIR @@ -155,6 +155,7 @@ m4_if(_LTDL_DIR, [], [subproject], [AC_CONFIG_SUBDIRS(_LTDL_DIR) _LT_SHELL_INIT([lt_dlopen_dir="$lt_ltdl_dir"])], [nonrecursive], [_LT_SHELL_INIT([lt_dlopen_dir="$lt_ltdl_dir"])], + [recursive]' [], [m4_fatal([unknown libltdl mode: ]_LTDL_MODE)])])dnl dnl Be careful not to expand twice: m4_define([$0], [])