* 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
This commit is contained in:
Thomas Tanner 1999-12-15 13:35:21 +00:00 committed by Thomas Tanner
parent afe514df6a
commit 9cda34041b
4 changed files with 17 additions and 11 deletions

View File

@ -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> 1999-12-13 Gary V. Vaughan <gary@oranda.demon.co.uk>
* NEWS: updated. * NEWS: updated.

View File

@ -18,8 +18,7 @@ for sub in demo depdemo libltdl mdemo cdemo; do
cd $sub cd $sub
rm -f acinclude.m4 rm -f acinclude.m4
cp ../libtool.m4 acinclude.m4 cp ../libtool.m4 acinclude.m4
test -f ltdl.m4 && cat ltdl.m4 >> acinclude.m4 aclocal -I .
aclocal
test "$sub" = libltdl && autoheader test "$sub" = libltdl && autoheader
automake --gnits --add-missing automake --gnits --add-missing
autoconf autoconf

View File

@ -1,6 +1,10 @@
dnl Process this file with autoconf to create configure. dnl Process this file with autoconf to create configure.
AC_INIT(ltdl.c) 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 -z "$enable_ltdl_install$enable_ltdl_convenience"; then
if test -f ${srcdir}/ltconfig && test -f ${srcdir}/ltmain.sh; then if test -f ${srcdir}/ltconfig && test -f ${srcdir}/ltmain.sh; then

View File

@ -1952,15 +1952,7 @@ compiler."
esac esac
done done
lib_search_path="$lib_search_path $sys_lib_search_path" lib_search_path="$lib_search_path $sys_lib_search_path"
dependency_libs="$newdependency_libs"
# 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
# Eliminate all temporary directories. # Eliminate all temporary directories.
for path in $uninst_path; do for path in $uninst_path; do