* libltdl/configure.ac: Use AC_CONFIG_AUX_DIR([.]) to place

auxilary files in the libltdl directory.
* Makefile.am: Add to the ltmain.sh rule to copy it into the
libltdl subdirectory.
* bootstrap: Explicitly handle ltmain.sh in libltdl, and pass
--copy to automake.

diff --git a/ChangeLog b/ChangeLog
index 50520942784373eda1c7af0f8413dd3951da023a..aa617de7e8afb22948b3249a66256097e20e2e53 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-02-24  Robert Boehne  <rboehne@gnu.org>
+
+       * libltdl/configure.ac: Use AC_CONFIG_AUX_DIR([.]) to place
+       auxilary files in the libltdl directory.
+       * Makefile.am: Add to the ltmain.sh rule to copy it into the
+       libltdl subdirectory.
+       * bootstrap: Explicitly handle ltmain.sh in libltdl, and pass
+       --copy to automake.
+
 2003-02-24  Ralph Schleicher  <rs@nunatak.allgaeu.org>
 
        * libtool.m4 (AC_LIBTOOL_SETUP): Check for ar.

diff --git a/Makefile.am b/Makefile.am
index 62a5a47c1b7fd6ae3d88858e9b0c46563c88f6da..5f74d9c7dfcebfd99481c6bb5954a29d120782fe 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,6 +45,7 @@ $(srcdir)/ltmain.sh: $(srcdir)/ltmain.in $(TSDEPS)
            -e "s%@""TIMESTAMP@%$$date%" $(srcdir)/ltmain.in > ltmain.shT
        mv -f ltmain.shT $@ || \
        (rm -f $@ && cp ltmain.shT $@ && rm -f ltmain.shT)
+       cp $@ $(srcdir)/libltdl/
 
 # TSDEPS will be defined to TSDEPS_DIST at `make dist' time
 TSDEPS =

diff --git a/bootstrap b/bootstrap
index 18f675f1f03f6fd52a5a4e8bca80d226052f2af3..7070a9f1c3da07deecb7290000f9e4f89a39b5ea 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -13,6 +13,7 @@ find . \( -name autom4te.cache -o -name libtool \) -exec rm -r {} \;
 # fake the libtool scripts
 touch ltmain.sh
 touch libtoolize
+(cd libltdl && touch ltmain.sh)
 
 for sub in . libltdl cdemo demo depdemo mdemo pdemo tagdemo f77demo; do
   case $sub in
@@ -24,7 +25,7 @@ for sub in . libltdl cdemo demo depdemo mdemo pdemo tagdemo f77demo; do
   libltdl)
     top_srcdir=..
     acfiles="$top_srcdir/libtool.m4 $top_srcdir/ltdl.m4"
-    AUTOMAKE_FLAGS="--gnits --add-missing"
+    AUTOMAKE_FLAGS="--gnits --add-missing --copy"
     ;;
   *)
     top_srcdir=..
@@ -46,6 +47,6 @@ for sub in . libltdl cdemo demo depdemo mdemo pdemo tagdemo f77demo; do
   cd $top_srcdir
 done
 
-rm -f ltmain.sh libtoolize
+rm -f ltmain.sh libtoolize libltdl/ltmain.sh
 
 exit 0

diff --git a/libltdl/configure.ac b/libltdl/configure.ac
index 225883ee6786551eb0df0849257c23c7bd090426..66ad0e5f2d746327d41f2d5052eae3b567166da4 100644 (file)
--- a/libltdl/configure.ac
+++ b/libltdl/configure.ac
@@ -32,12 +32,7 @@ AC_CONFIG_SRCDIR([ltdl.c])
 ## Libltdl specific configuration. ##
 ## ------------------------------- ##
 
-# We shouldn't be using these internal macros of autoconf,
-# but CONFIG_AUX_DIR($with_auxdir) breaks automake.
-AC_ARG_WITH([auxdir],
-    [AC_HELP_STRING([--with-auxdir=DIR], [path to autoconf auxiliary files])],
-    [AC_CONFIG_AUX_DIRS($with_auxdir)],
-    [AC_CONFIG_AUX_DIR_DEFAULT])
+AC_CONFIG_AUX_DIR([.])
 
 if test -z "$enable_ltdl_install$enable_ltdl_convenience"; then
   if test -f ${srcdir}/ltmain.sh; then