|
 |
585267 |
diff -up squid-3.1.9/aclocal.m4.ltdl squid-3.1.9/aclocal.m4
|
|
|
585267 |
--- squid-3.1.9/aclocal.m4.ltdl 2010-10-25 13:34:41.000000000 +0200
|
|
|
585267 |
+++ squid-3.1.9/aclocal.m4 2010-11-01 14:14:55.297324980 +0100
|
|
|
585267 |
@@ -1217,7 +1217,7 @@ _LT_SET_OPTIONS([$0], [$1])
|
|
|
585267 |
LIBTOOL_DEPS="$ltmain"
|
|
|
585267 |
|
|
|
585267 |
# Always use our own libtool.
|
|
|
585267 |
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
|
|
585267 |
+LIBTOOL='$(SHELL) libtool'
|
|
|
585267 |
AC_SUBST(LIBTOOL)dnl
|
|
|
585267 |
|
|
|
585267 |
_LT_SETUP
|
|
|
585267 |
diff -up squid-3.1.9/configure.ltdl squid-3.1.9/configure
|
|
|
585267 |
--- squid-3.1.9/configure.ltdl 2010-10-25 13:35:32.000000000 +0200
|
|
|
585267 |
+++ squid-3.1.9/configure 2010-11-01 14:14:55.320299060 +0100
|
|
|
585267 |
@@ -10286,7 +10286,7 @@ fi
|
|
|
585267 |
LIBTOOL_DEPS="$ltmain"
|
|
|
585267 |
|
|
|
585267 |
# Always use our own libtool.
|
|
|
585267 |
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
|
|
585267 |
+LIBTOOL='$(SHELL) libtool'
|
|
|
585267 |
|
|
|
585267 |
|
|
|
585267 |
|
|
|
585267 |
diff -up squid-3.1.9/Makefile.am.ltdl squid-3.1.9/Makefile.am
|
|
|
585267 |
--- squid-3.1.9/Makefile.am.ltdl 2010-11-02 08:16:07.165707548 +0100
|
|
|
585267 |
+++ squid-3.1.9/Makefile.am 2010-11-02 08:16:52.977565320 +0100
|
|
|
585267 |
@@ -2,11 +2,8 @@
|
|
|
585267 |
#
|
|
|
585267 |
|
|
|
585267 |
AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5 foreign
|
|
|
585267 |
-DIST_SUBDIRS = compat lib libltdl snmplib scripts icons errors contrib doc helpers src test-suite tools
|
|
|
585267 |
+DIST_SUBDIRS = compat lib snmplib scripts icons errors contrib doc helpers src test-suite tools
|
|
|
585267 |
SUBDIRS = compat lib $(makesnmplib)
|
|
|
585267 |
-if USE_LOADABLE_MODULES
|
|
|
585267 |
-SUBDIRS += libltdl
|
|
|
585267 |
-endif
|
|
|
585267 |
SUBDIRS += scripts icons errors doc helpers src tools test-suite
|
|
|
585267 |
|
|
|
585267 |
DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
|
|
|
585267 |
diff -up squid-3.1.9/Makefile.in.ltdl squid-3.1.9/Makefile.in
|
|
|
585267 |
--- squid-3.1.9/Makefile.in.ltdl 2010-11-02 08:16:13.630458557 +0100
|
|
|
585267 |
+++ squid-3.1.9/Makefile.in 2010-11-02 08:17:26.543714199 +0100
|
|
|
585267 |
@@ -35,7 +35,7 @@ PRE_UNINSTALL = :
|
|
|
585267 |
POST_UNINSTALL = :
|
|
|
585267 |
build_triplet = @build@
|
|
|
585267 |
host_triplet = @host@
|
|
|
585267 |
-@USE_LOADABLE_MODULES_TRUE@am__append_1 = libltdl
|
|
|
585267 |
+# @USE_LOADABLE_MODULES_TRUE@am__append_1 = libltdl
|
|
|
585267 |
subdir = .
|
|
|
585267 |
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
|
|
|
585267 |
$(srcdir)/Makefile.in $(top_srcdir)/configure \
|
|
|
585267 |
@@ -325,7 +325,7 @@ top_build_prefix = @top_build_prefix@
|
|
|
585267 |
top_builddir = @top_builddir@
|
|
|
585267 |
top_srcdir = @top_srcdir@
|
|
|
585267 |
AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5 foreign
|
|
|
585267 |
-DIST_SUBDIRS = compat lib libltdl snmplib scripts icons errors contrib doc helpers src test-suite tools
|
|
|
585267 |
+DIST_SUBDIRS = compat lib snmplib scripts icons errors contrib doc helpers src test-suite tools
|
|
|
585267 |
SUBDIRS = compat lib $(makesnmplib) $(am__append_1) scripts icons \
|
|
|
585267 |
errors doc helpers src tools test-suite
|
|
|
585267 |
DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
|