X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=autogen.sh;h=902181d8209f452e45ad632324626ac21154a749;hb=4e70b25df5a2ed6c11ff2df04b7f925e8d48bfbe;hp=a9614a5c404daf8ef8c6c089a20ca556556b4ac3;hpb=8b22b43669d936ab75914732209f93a0b7ee81f4;p=catta

diff --git a/autogen.sh b/autogen.sh
index a9614a5..902181d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -22,9 +22,17 @@ VERSION=1.9
 
 run_versioned() {
     local P
-    type -p "$1-$2" &> /dev/null && P="$1-$2" \
-	|| type -p "$1`echo $2 | tr -d '.'`" &> /dev/null && P="$1`echo $2 | tr -d '.'`" \
-	|| local P="$1"
+    local V
+
+    V=$(echo "$2" | sed -e 's,\.,,g')
+    
+    if type -p "$1$V" &> /dev/null ; then
+    	P="$1$V" 
+    elif type -p "$1-$2" &> /dev/null ; then
+    	P="$1-$2" 
+    else
+    	P="$1"
+    fi
 
     shift 2
     "$P" "$@"
@@ -39,7 +47,9 @@ else
     rm -rf autom4te.cache
     rm -f config.cache
 
-    run_versioned libtoolize 1.5 -c --force
+    test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=libtoolize
+
+    "$LIBTOOLIZE" -c --force
     run_versioned aclocal "$VERSION" -I common
     run_versioned autoconf 2.59 -Wall
     run_versioned autoheader 2.59
@@ -50,8 +60,3 @@ else
         make clean
     fi
 fi
-
-# on FreeBSD i must copy this file
-# cp /usr/local/share/aclocal/libtool15.m4 common/
-# cp /usr/local/share/aclocal/pkg.m4 common/
-#./configure --disable-qt3 --disable-qt4 --disable-mono --disable-monodoc --disable-python --disable-dbus --disable-glib --disable-expat --disable-libdaemon --with-distro=none --disable-gtk --disable-xmltoman