From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Thu, 15 Jul 2010 15:13:23 +0000 (+0200)
Subject: Update libtool autoconf macros to libtool2 style
X-Git-Tag: SQUID_3_2_0_1~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=081863f3d0c1e0372189280dd69cfe91686153d2;p=thirdparty%2Fsquid.git

Update libtool autoconf macros to libtool2 style
---

diff --git a/configure.in b/configure.in
index f7da7fa06f..e32395fc96 100644
--- a/configure.in
+++ b/configure.in
@@ -109,19 +109,14 @@ else
     AC_DISABLE_SHARED
 fi
 
-AC_LIBTOOL_DLOPEN
+LT_INIT([dlopen])
 if test $use_loadable_modules = yes;
 then
-    dnl Linux LTDL v3-v7 macros assume the autoconf 2.62 variable top_build_prefix is defined
-    dnl But from autoconf 2.64 its called ac_top_build_prefix and not automatically added to the Makefile
-    top_build_prefix=${ac_top_build_prefix}
-    AC_SUBST(top_build_prefix)
-
-    AC_LIBLTDL_CONVENIENCE
+    LTDL_INIT
 fi
+
 dnl LibTool environment is now prepared for setup. Check that it is usable and initialize.
-AC_PROG_LIBTOOL
-AC_LTDL_DLLIB
+LT_LIB_DLLOAD
 
 # Do we need these unconditionally for "make distcheck" to work?
 AC_SUBST(INCLTDL)
@@ -129,12 +124,11 @@ AC_SUBST(LIBLTDL)
 
 if test $use_loadable_modules = yes;
 then
-    # Why is this needed? Should not AC_LIBTOOL_DLOPEN from libtool do that?
+    # Why is this needed? Should not LT_INIT (or LT_LIB_DLLOAD) from libtool do that?
     LIBADD_DL=${lt_cv_dlopen_libs}
     AC_SUBST([LIBADD_DL])
 fi
 
-
 SQUID_CC_GUESS_VARIANT
 SQUID_CC_GUESS_OPTIONS
 
@@ -1891,7 +1885,7 @@ AC_SUBST(EXTERNAL_ACL_HELPERS)
 dnl Select url_rewrite helpers to build
 URL_REWRITE_HELPERS=all
 AC_ARG_ENABLE(url-rewrite-helpers,
-  AC_HELP_STRING([--enable-url-rewrite-helpers="list of helpers"],
+  AS_HELP_STRING([--enable-url-rewrite-helpers="list of helpers"],
                  [This option selects which url_rewrite helpers to
                   build and install as part of the normal build
                   process. For a list of available helpers see the
@@ -3862,6 +3856,6 @@ AC_CONFIG_FILES([\
 AC_CONFIG_SUBDIRS(lib/libTrie)
 
 # must configure libltdl subdir unconditionally for "make distcheck" to work
-AC_CONFIG_SUBDIRS(libltdl)
+#AC_CONFIG_SUBDIRS(libltdl)
 
 AC_OUTPUT