X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=autogen.sh;h=78f26c9d632c0cdc5a5e17d9712d31d47add7b2b;hb=4079dd94f3425d503b5db5faca6561151a3b209f;hp=902181d8209f452e45ad632324626ac21154a749;hpb=b3aeac1deb4a0aa645f144ace4c4688f4655489b;p=catta

diff --git a/autogen.sh b/autogen.sh
index 902181d..78f26c9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -26,12 +26,14 @@ run_versioned() {
 
     V=$(echo "$2" | sed -e 's,\.,,g')
     
-    if type -p "$1$V" &> /dev/null ; then
+    if [ -e "`which $1$V`" ] ; then
     	P="$1$V" 
-    elif type -p "$1-$2" &> /dev/null ; then
-    	P="$1-$2" 
     else
-    	P="$1"
+	if [ -e "`which $1-$2`" ] ; then
+	    P="$1-$2" 
+	else
+	    P="$1"
+	fi
     fi
 
     shift 2
@@ -47,8 +49,15 @@ else
     rm -rf autom4te.cache
     rm -f config.cache
 
+    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
     run_versioned autoconf 2.59 -Wall