Cleanup: use libtool/libtdl default location

It is simpler to use the default libltdl location than hiding libtool
away in our custom directory and requiring a bootstrap to set it up.

diff --git a/Makefile.am b/Makefile.am
index e1c34602d4ec05520750591f851ce7277ba8e226..c38c5c3345a8674efcbc7ca26b7d762790fe0677 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,8 +2,12 @@
 #
 
 AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5 foreign
-DIST_SUBDIRS   = compat lib snmplib scripts src icons errors contrib doc helpers test-suite tools
-SUBDIRS                = compat lib @makesnmplib@ scripts src icons errors doc helpers test-suite tools
+DIST_SUBDIRS   = compat lib libltdl snmplib scripts src icons errors contrib doc helpers test-suite tools
+SUBDIRS                = compat lib @makesnmplib@
+if USE_LOADABLE_MODULES
+SUBDIRS += libltdl
+endif
+SUBDIRS += scripts src icons errors doc helpers test-suite tools
 
 DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
 DEFAULT_PINGER         = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`

diff --git a/bootstrap.sh b/bootstrap.sh
index b814b272a1f13d3922cde8a7cb483ff91450d94a..b6dd2f6f83e857d1fd5b0b1059bf4c74621c018a 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -82,12 +82,7 @@ bootstrap_libtoolize() {
     # instead of manualy moving files from ltdl to lib/libLtdl
     if egrep -q '^[[:space:]]*AC_LIBLTDL_' configure.in
     then
-       if libtoolize$ltver --help | grep -q -- --ltdl.=; then
-           ltdl="--ltdl=lib/libLtdl"
-       else
-           ltdl="--ltdl"
-           copy_libltdl=1
-       fi
+       ltdl="--ltdl"
     else
         ltdl=""
     fi
@@ -95,7 +90,7 @@ bootstrap_libtoolize() {
     bootstrap libtoolize$ltver $ltdl --force --copy --automake
 
     # customize generated libltdl, if any
-    if test -d libltdl && [ $copy_libltdl ]
+    if test -d libltdl
     then
         src=libltdl
 
@@ -106,19 +101,6 @@ bootstrap_libtoolize() {
         chmod u+w $makefile
         mv $makefile.new $makefile
         chmod u-w $makefile
-
-        dest=lib/libLtdl
-        # move $src to $dest
-       if test -d $dest # already exists
-       then
-           echo "Updating $dest from $src."
-            chmod u+w $dest/*
-            mv $src/* $dest/
-            rmdir $src
-       else
-           echo "Creating $dest from $src."
-           mv $src $dest
-        fi
     fi
 }
 

diff --git a/configure.in b/configure.in
index ff295223914349348073f225f1a8385a2ae424af..cdde491f5e2a4e0737e132c59ffb79d0c79174fc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -81,7 +81,7 @@ then
     top_build_prefix=${ac_top_build_prefix}
     AC_SUBST(top_build_prefix)
 
-    AC_LIBLTDL_CONVENIENCE(lib/libLtdl)
+    AC_LIBLTDL_CONVENIENCE
 fi
 AC_PROG_LIBTOOL
 AC_LTDL_DLLIB
@@ -4328,6 +4328,6 @@ AC_CONFIG_FILES([\
 AC_CONFIG_SUBDIRS(lib/libTrie)
 
 # must configure libltdl subdir unconditionally for "make distcheck" to work
-AC_CONFIG_SUBDIRS(lib/libLtdl)
+AC_CONFIG_SUBDIRS(libltdl)
 
 AC_OUTPUT

diff --git a/lib/Makefile.am b/lib/Makefile.am
index c6372e678641a65159b091986634b938f8216eee..ce46223510f921627126247717c695ec85e1a03a 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -7,10 +7,6 @@ include $(top_srcdir)/src/Common.am
 
 SUBDIRS =
 
-if USE_LOADABLE_MODULES
-SUBDIRS += libLtdl
-endif
-
 if USE_ESI
 SUBDIRS += libTrie
 endif

diff --git a/src/LoadableModule.cc b/src/LoadableModule.cc
index d491da191c9cbb558c141bab95fa91612f2d266b..faf96c541124765b0038d18aadfa87eba2d77e26 100644 (file)
--- a/src/LoadableModule.cc
+++ b/src/LoadableModule.cc
@@ -7,7 +7,7 @@
 #define XSTD_USE_LIBLTDL 1
 
 #if XSTD_USE_LIBLTDL
-#include "libLtdl/ltdl.h" /* generated file */
+#include "libltdl/ltdl.h" /* generated file */
 #else
 #include <dlfcn.h>
 #endif

diff --git a/src/Makefile.am b/src/Makefile.am
index 914d9377c5d4b1c7789fbb945d79973a28e12ab9..f0bcaadddc6f219d74e57fa2997c21285109f7a3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -166,9 +166,6 @@ COMMON_LIBS = \
        ip/libip.la \
        fs/libfs.la
 
-## Loadable Modules needs lib/libLtdl stuff
-INCLUDES += -I$(top_srcdir)/lib -I$(top_srcdir)/lib/libLtdl
-
 EXTRA_PROGRAMS = \
        DiskIO/DiskDaemon/diskd \
        unlinkd \