From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 19 Dec 2009 11:56:02 +0000 (+1300)
Subject: Cleanup: use libtool/libtdl default location
X-Git-Tag: SQUID_3_2_0_1~505
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=660faa02bdb4d3348f0a048424a28f0be42624a6;p=thirdparty%2Fsquid.git

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 e1c34602d4..c38c5c3345 100644
--- 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 b814b272a1..b6dd2f6f83 100755
--- 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 ff29522391..cdde491f5e 100644
--- 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 c6372e6786..ce46223510 100644
--- 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 d491da191c..faf96c5411 100644
--- 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 914d9377c5..f0bcaadddc 100644
--- 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 \