* configure.in (ACINCLUDE_M4_LIST): Removed libltdl/acinclude.m4.

* Makefile.am (aclocal_macros): Added ltdl.m4.
(libltdl/acinclude.m4): Concatenate libtool.m4 and ltdl.m4.
* bootstrap: Remove duplicate libltdl.

diff --git a/ChangeLog b/ChangeLog
index be63a7647845f43e44584ef30bd30840e170bd54..64b694b6c50925626a0b65c5bc6b614a5dbbb402 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2000-05-14  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
 
+       * configure.in (ACINCLUDE_M4_LIST): Removed libltdl/acinclude.m4.
+       * Makefile.am (aclocal_macros): Added ltdl.m4.
+       (libltdl/acinclude.m4): Concatenate libtool.m4 and ltdl.m4.
+       * bootstrap: Remove duplicate libltdl.
+
        * libtool.m4 (AC_LIBLTDL_CONVENIENCE, AC_LIBLTDL_INSTALLABLE):
        Pick LIBLTLD from top_builddir and INCLTDL from top_srcdir.
        * mdemo/configure.in: Remove comments on

diff --git a/Makefile.am b/Makefile.am
index bcf3734082dfaf395adc4eb49b7c4fefcd90e980..8f7a37b60b3336f48f3d4d04e95d60698891651c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@ CXXFLAGS = @CXXFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS= @LIBS@
 
-aclocal_macros = libtool.m4
+aclocal_macros = libtool.m4 ltdl.m4
 
 EXTRA_DIST = $(aclocal_macros) libtoolize.in ltconfig.in ltmain.in \
         ltcf-c.sh ltcf-cxx.sh \
@@ -102,7 +102,7 @@ update-timestamps:
        (rm -f $@ && cp ltconfig.T $@ && rm -f ltconfig.T)
 
 @srcdir@/ltmain.sh: $(srcdir)/ltmain.in $(top_srcdir)/configure.in $(TSDEPS)
-       rm -f ltmain.shT
+       -rm -f ltmain.shT
        date=`$(SHELL) $(srcdir)/mkstamp < $(srcdir)/ChangeLog` && \
        sed -e 's/@''PACKAGE@/@PACKAGE@/' -e 's/@''VERSION@/@VERSION@/' \
            -e "s%@""TIMESTAMP@%$$date%" $(srcdir)/ltmain.in > ltmain.shT
@@ -110,11 +110,17 @@ update-timestamps:
        (rm -f $@ && cp ltmain.shT $@ && rm -f ltmain.shT)
 
 # All our rules should depend on these demo files.
-all-recursive: $(ACINCLUDE_M4_LIST)
+all-recursive: $(srcdir)/libltdl/acinclude.m4 $(ACINCLUDE_M4_LIST)
+
+@srcdir@/libltdl/acinclude.m4: $(srcdir)/libtool.m4 $(srcdir)/ltdl.m4
+       -rm -f $@ $@T
+       cat $(srcdir)/libtool.m4 $(srcdir)/ltdl.m4 > $@T
+       mv $@T $@
 
 @ACINCLUDE_M4_LIST@: $(srcdir)/libtool.m4
-       rm -f $@
-       cp $(srcdir)/libtool.m4 $@
+       -rm -f $@ $@T
+       cat $(srcdir)/libtool.m4 > $@T
+       mv $@T $@
 
 .PHONY: configure-subdirs
 configure-subdirs distdir: $(DIST_MAKEFILE_LIST)

diff --git a/bootstrap b/bootstrap
index 1c380c1cb133b5f15ef0e6778ef139930a94b441..b1839e642b0ca0040846fea07fc87ee13e8de811 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -14,7 +14,7 @@ aclocal
 automake --gnu --add-missing
 autoconf
 
-for sub in libltdl demo depdemo libltdl mdemo cdemo tagdemo; do
+for sub in libltdl demo depdemo mdemo cdemo tagdemo; do
   cd $sub
   rm -f acinclude.m4
   cat ../libtool.m4 > acinclude.m4

diff --git a/configure.in b/configure.in
index 8c22a24c8403715bdb498eb9fcb88d9fb3c45a04..8800372f42f4db483683685cd49e4e2c255b6a7f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -71,10 +71,10 @@ dnl included in the distribution
 CONF_SUBDIRS="cdemo demo depdemo mdemo tagdemo"
 AC_SUBST(CONF_SUBDIRS)
 
-ACINCLUDE_M4_LIST="${srcdir}/acinclude.m4 ${srcdir}/libltdl/acinclude.m4 "
+ACINCLUDE_M4_LIST="${srcdir}/acinclude.m4"
 DIST_MAKEFILE_LIST=
 for dir in $CONF_SUBDIRS; do
-  ACINCLUDE_M4_LIST="$ACINCLUDE_M4_LIST${srcdir}/$dir/acinclude.m4 "
+  ACINCLUDE_M4_LIST="$ACINCLUDE_M4_LIST ${srcdir}/$dir/acinclude.m4"
   DIST_MAKEFILE_LIST="$DIST_MAKEFILE_LIST$dir/Makefile "
 done
 AC_SUBST(ACINCLUDE_M4_LIST)