* configure.in, Makefile.am, NEWS: install libltdl by default

diff --git a/ChangeLog b/ChangeLog
index 247938b2b7174b56b0fffc5ec653174e4b7202bd..58d73e5855fac6466fd0b8d97910060f595cb941 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 1999-03-09  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+       * 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 1479f98e302113d4ad62abb022f874a1b3e6619a..a87a9e515fdeda9a009294cea4ae80e7bac802c4 100644 (file)
--- 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 23311b0d05c8a1c9589979614a2cd94224eaa40d..fd5b8d63edf2c2830b3752b9c413cf3470688967 100644 (file)
--- 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 e88cd5948c2a2d52c4d08146f8782181dadf201d..295598a9b6d3587ae19045f9017a9c0b3a9ef05c 100644 (file)
--- 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 "