From: Gary V. Vaughan Date: Sat, 31 Jul 2004 00:17:02 +0000 (+0000) Subject: Although libtool is optimised to not need to subconfigure libltdl, X-Git-Tag: release-1-9b~30 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ffafe9407216e3675de3eca487e21ba5822ee2a;p=thirdparty%2Flibtool.git Although libtool is optimised to not need to subconfigure libltdl, the installed libltdl sources for libtoolize need to put libltdl/configure.ac in the parent package so that *it* can subconfigure libltdl. That way we don't put any constraints on the build system used by the parent package because the libtoolized libltdl subtree is a self-contained sub-project: * libltdl/Makefile.am (EXTRA_DIST): Add configure.ac. (nobase_ltdldata_DATA): Change back to libltdl's own configure.ac. --- diff --git a/ChangeLog b/ChangeLog index 62b3466eb..514dcf1c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2004-07-31 Gary V. Vaughan + + Although libtool is optimised to not need to subconfigure libltdl, + the installed libltdl sources for libtoolize need to put + libltdl/configure.ac in the parent package so that *it* can + subconfigure libltdl. That way we don't put any constraints on + the build system used by the parent package because the + libtoolized libltdl subtree is a self-contained sub-project: + + * libltdl/Makefile.am (EXTRA_DIST): Add configure.ac. + (nobase_ltdldata_DATA): Change back to libltdl's own + configure.ac. + 2004-07-30 Gary V. Vaughan My thanks to Alexandre Duret-Lutz for the insight diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am index 402dbeede..18314af71 100644 --- a/libltdl/Makefile.am +++ b/libltdl/Makefile.am @@ -21,7 +21,7 @@ SUBDIRS = loaders . BUILT_SOURCES = MOSTLYCLEANFILES = -EXTRA_DIST = +EXTRA_DIST = configure.ac AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 @@ -68,7 +68,7 @@ libltdlc_la_LIBADD = $(libdlloader_la_OBJECTS) $(libdlloader_la_LIBADD) ## These are installed as a subdirectory of pkgdatadir so that ## libtoolize --ltdl can find them later: ltdldatadir = $(pkgdatadir)/libltdl -nobase_ltdldata_DATA = COPYING.LIB Makefile.am README $(top_srcdir)/configure.ac \ +nobase_ltdldata_DATA = COPYING.LIB Makefile.am README configure.ac \ $(libltdl_la_SOURCES) $(libdlloader_la_SOURCES) \ lt__dirent.c lt__dirent.h argz_.h argz.c