]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Support libtool2
authorHenrik Nordstrom <henrik@henriknordstrom.net>
Wed, 18 Feb 2009 12:18:04 +0000 (13:18 +0100)
committerHenrik Nordstrom <henrik@henriknordstrom.net>
Wed, 18 Feb 2009 12:18:04 +0000 (13:18 +0100)
bootstrap.sh

index c271b30f7599f70f98eaa11f572612e3314f9abb..429d54af854ba5dcfa56c5be6638735ba7c3a0dd 100755 (executable)
@@ -59,15 +59,20 @@ bootstrap_libtoolize() {
     # instead of manualy moving files from ltdl to lib/libLtdl
     if egrep -q '^[[:space:]]*AC_LIBLTDL_' configure.in
     then
-        extras="--ltdl"
+       if libtoolize$ltver --help | grep -q -- --ltdl.=; then
+           ltdl="--ltdl=lib/libLtdl"
+       else
+           ltdl="--ltdl"
+           copy_libltdl=1
+       fi
     else
-        extras=""
+        ltdl=""
     fi
 
-    bootstrap libtoolize$ltver $extras --force --copy --automake
+    bootstrap libtoolize$ltver $ltdl --force --copy --automake
 
     # customize generated libltdl, if any
-    if test -d libltdl
+    if test -d libltdl && [ $copy_libltdl ]
     then
         src=libltdl