* libltdl/configure.in: path to auxiliary files can be specified

  using --with-auxdir (idea by Howard Chu <hyc@highlandsun.com>)

* ltmain.in: don't remove multiple occurences from dependency_libs
  of a library, otherwise many dependencies would get lost

* bootstrap: use "aclocal -I ." instead of adding the contents
  of ltdl.m4 to acinclude.m4

diff --git a/ChangeLog b/ChangeLog
index 02ea5674adf5d569ba7a6124116e02c01f243f02..82bd400e7ae8e2b3c5f8b13c38355083d5de0542 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+1999-12-15  Thomas Tanner  <tanner@ffii.org>
+
+       * libltdl/configure.in: path to auxiliary files can be specified
+         using --with-auxdir (idea by Howard Chu <hyc@highlandsun.com>)
+
+       * ltmain.in: don't remove multiple occurences from dependency_libs
+         of a library, otherwise many dependencies would get lost
+
+       * bootstrap: use "aclocal -I ." instead of adding the contents
+         of ltdl.m4 to acinclude.m4
+
 1999-12-13  Gary V. Vaughan  <gary@oranda.demon.co.uk>
 
        * NEWS: updated.

diff --git a/bootstrap b/bootstrap
index 31a5e627746cb5f93f80cba6399adbc5e0b6b9ea..48b1330531a1f27faae600a26b0025cbb746daaa 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -18,8 +18,7 @@ for sub in demo depdemo libltdl mdemo cdemo; do
   cd $sub
   rm -f acinclude.m4
   cp ../libtool.m4 acinclude.m4
-  test -f ltdl.m4 && cat ltdl.m4 >> acinclude.m4
-  aclocal
+  aclocal -I .
   test "$sub" = libltdl && autoheader
   automake --gnits --add-missing
   autoconf

diff --git a/libltdl/configure.in b/libltdl/configure.in
index 766a9aa8adbb920511d7cbdce449ed34b4ebf6d3..803dd919747c396c622c253222d8a1a37a0832d3 100644 (file)
--- a/libltdl/configure.in
+++ b/libltdl/configure.in
@@ -1,6 +1,10 @@
 dnl Process this file with autoconf to create configure.
 
 AC_INIT(ltdl.c)
+AC_ARG_WITH(auxdir,
+[  --with-auxdir=DIR   path to autoconf auxiliary files],,
+[if test -f ../config.sub; then with_auxdir=..; else with_auxdir=../..; fi])
+AC_CONFIG_AUX_DIR($with_auxdir)
 
 if test -z "$enable_ltdl_install$enable_ltdl_convenience"; then
   if test -f ${srcdir}/ltconfig && test -f ${srcdir}/ltmain.sh; then

diff --git a/ltmain.in b/ltmain.in
index f9406209d6ddb6250376da5c6a875b88dad41f34..e3877aa1a51595b6a887b3d87cc7e8089f67c16d 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -1952,15 +1952,7 @@ compiler."
        esac
       done
       lib_search_path="$lib_search_path $sys_lib_search_path"
-      
-      # Make sure newdependency_libs contains only unique libraries and directories.
-      dependency_libs=
-      for deplib in $newdependency_libs; do
-       case "$dependency_libs " in
-       *" $deplib "*) ;;
-       *) dependency_libs="$dependency_libs $deplib" ;;
-       esac
-      done
+      dependency_libs="$newdependency_libs"
       
       # Eliminate all temporary directories.
       for path in $uninst_path; do