Update autogen.sh to try several names for libtoolize.

git-svn-id: svn://vcs.exim.org/pcre/code/trunk@484 2f5784b3-3f2a-0410-8824-cb99058d5e15

2 files changed, 26 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index b27d121..f832c15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -102,7 +102,10 @@ Version 8.01 11-Dec-09
     example, SunCC recognizes above declarations as different functions and
     generates broken code for hbpcre." I have changed the declarations to use 
     USPTR.
-        
+    
+16. GNU libtool is named differently on some systems. The autogen.sh script now 
+    tries several variants such as glibtoolize (MacOSX) and libtoolize1x
+    (FreeBSD).
  
 
 
diff --git a/autogen.sh b/autogen.sh
index 6d7dbb0..be95967 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,21 +1,37 @@
 #!/bin/sh
 
 set -ex
-
 rm -rf autom4te.cache
-
 aclocal --force
 
-libtoolize -c -f
+# GNU libtool is named differently on some systems.  This code tries several
+# variants like glibtoolize (MacOSX) and libtoolize1x (FreeBSD)
+
+set +ex
+echo "Looking for a version of libtoolize (which can have different names)..."
+libtoolize=""
+for l in glibtoolize libtoolize15 libtoolize14 libtoolize ; do
+    $l --version > /dev/null 2>&1
+    if [ $? = 0 ]; then
+        libtoolize=$l
+        echo "Found $l" 
+        break
+    fi
+    echo "Did not find $l" 
+done
+
+if [ "x$libtoolize" == "x" ]; then
+    echo "Can't find libtoolize on your system"
+    exit 1
+fi
 
+set -ex
+$libtoolize -c -f
 autoconf -f -W all,no-obsolete
-
 autoheader -f -W all
-
 automake -a -c -f -W all
 
 rm -rf autom4te.cache
-
 exit 0
 
 # end autogen.sh