From 96e28112be8f708361836cae182b45437be0e396 Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Tue, 9 Mar 1999 22:13:49 +0000 Subject: [PATCH] * configure.in, Makefile.am, NEWS: install libltdl by default --- ChangeLog | 2 ++ Makefile.am | 3 +-- NEWS | 1 + configure.in | 11 ++++++++++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 247938b2b..58d73e585 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 1999-03-09 Alexandre Oliva + * configure.in, Makefile.am, NEWS: install libltdl by default + * libtool.m4 (AC_LIBLTDL_INSTALLABLE, AC_LIBLTDL_CONVENIENCE): new macros * NEWS: ditto diff --git a/Makefile.am b/Makefile.am index 1479f98e3..a87a9e515 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = 1.3e gnits readme-alpha -BUILD_SUBDIRS = . doc tests +BUILD_SUBDIRS = . libltdl doc tests SUBDIRS = $(BUILD_SUBDIRS) DIST_SUBDIRS = $(BUILD_SUBDIRS) $(CONF_SUBDIRS) @@ -80,7 +80,6 @@ update-timestamps: # All our rules should depend on these demo files. all-local check-local: $(ACINCLUDE_M4_LIST) libtool -check-local: libltdl/Makefile @ACINCLUDE_M4_LIST@: $(srcdir)/libtool.m4 rm -f $@ diff --git a/NEWS b/NEWS index 23311b0d0..fd5b8d63e 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ NEWS - list of user-visible changes between releases of GNU Libtool New in 1.2e: CVS version; 1.2f: 1999-?-?, Libtool team: +* libltdl is now built and installed unless --disable-ltdl-install * New AC_LIBLTDL_CONVENIENCE and AC_LIBLTDL_INSTALLABLE macros, to select convenience and/or installable versions of libltdl. * In order for libtool to attempt to link a shared library (dll) on win32 diff --git a/configure.in b/configure.in index e88cd5948..295598a9b 100644 --- a/configure.in +++ b/configure.in @@ -39,9 +39,18 @@ AC_PROG_LN_S dnl For the `lineno' script (which puts line numbers into `ltconfig'). AC_PROG_AWK +AC_ARG_ENABLE(ltdl-install, + [--disable-ltdl-install do not install libltdl]) +if test x"$enable_ltdl_install" != xno; then + enable_ltdl_install=yes + ac_configure_args="$ac_configure_args --enable-ltdl-install" +fi +dnl Since this is handled by m4, it cannot be made conditional :-( +AC_CONFIG_SUBDIRS(libltdl) + dnl all subdirectories that are configured on demand, but that must be dnl included in the distribution -CONF_SUBDIRS="libltdl demo mdemo cdemo" # depdemo +CONF_SUBDIRS="demo mdemo cdemo" # depdemo AC_SUBST(CONF_SUBDIRS) ACINCLUDE_M4_LIST="${srcdir}/acinclude.m4 " -- 2.47.3