X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=autogen.sh;h=78f26c9d632c0cdc5a5e17d9712d31d47add7b2b;hb=fa40582137b464bac2efe111c3b8f75803bff619;hp=9205c57c6c4cbe6285ff2a62d6e080854c73acf6;hpb=f4dfb43f0e49ac87819db3254430948ad53b7b32;p=catta

diff --git a/autogen.sh b/autogen.sh
index 9205c57..78f26c9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -22,7 +22,19 @@ VERSION=1.9
 
 run_versioned() {
     local P
-    type -p "$1-$2" &> /dev/null && P="$1-$2" || local P="$1"
+    local V
+
+    V=$(echo "$2" | sed -e 's,\.,,g')
+    
+    if [ -e "`which $1$V`" ] ; then
+    	P="$1$V" 
+    else
+	if [ -e "`which $1-$2`" ] ; then
+	    P="$1-$2" 
+	else
+	    P="$1"
+	fi
+    fi
 
     shift 2
     "$P" "$@"
@@ -37,10 +49,19 @@ else
     rm -rf autom4te.cache
     rm -f config.cache
 
-    libtoolize -c --force
+    rm -f Makefile.am~ configure.ac~
+    # Evil, evil, evil, evil hack
+    sed 's/read dummy/\#/' `which gettextize` | sh -s -- --copy --force
+    test -f Makefile.am~ && mv Makefile.am~ Makefile.am
+    test -f configure.ac~ && mv configure.ac~ configure.ac
+
+    test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=libtoolize
+
+    intltoolize --copy --force --automake
+    "$LIBTOOLIZE" -c --force
     run_versioned aclocal "$VERSION" -I common
-    autoconf -Wall
-    autoheader
+    run_versioned autoconf 2.59 -Wall
+    run_versioned autoheader 2.59
     run_versioned automake "$VERSION" -a -c --foreign
 
     if test "x$NOCONFIGURE" = "x"; then