updated catalan.nsh from launchpad by Xavi Conde

[inkscape.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 5754c4220b183f281fe68e54838de1611307d920..2bf1fee7a761bbfc7d0b35a1e6161ae884d08e04 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,4 @@
-#!/bin/sh 
+#!/bin/bash 
 
 # This script does all the magic calls to automake/autoconf and
 # friends that are needed to configure a cvs checkout.  As described in
@@ -28,7 +28,13 @@ cd "$srcdir"
 
 check_version ()
 {
-    if expr "$1" \>= "$2" > /dev/null; then
+MAJOR1=`echo "$1" | cut -d"." -f1`;
+MINOR1=`echo "$1" | cut -s -d"." -f2`;
+MAJOR2=`echo "$2" | cut -d"." -f1`;
+MINOR2=`echo "$2" | cut -d"." -f2;`
+test -z "$MINOR1" && MINOR1="0";
+
+if [ "$MAJOR1" -gt "$MAJOR2" ] || [ "$MAJOR1" -eq "$MAJOR2" -a "$MINOR1" -ge "$MINOR2" ]; then
         echo "yes (version $1)"
     else
         echo "Too old (found version $1)!"
@@ -58,7 +64,7 @@ attempt_command () {
 }
 
 echo
-echo "I am testing that you have the required versions of libtool, autoconf," 
+echo "I am testing that you have the required versions of autoconf," 
 echo "automake, glib-gettextize and intltoolize. This test is not foolproof and"
 echo "if anything goes wrong, there may be guidance in the file HACKING.txt"
 echo
@@ -187,8 +193,7 @@ attempt_command 'underquoted definition of|[\)\#]Extending' \
        attempt_command '' autoheader
 }
 
-attempt_command '' libtoolize --copy --force
-attempt_command '' $AUTOMAKE --add-missing
+attempt_command '' $AUTOMAKE --copy --force --add-missing
 attempt_command '' autoconf
 attempt_command '^(Please add the files|  codeset|  progtest|from the|or directly|You will also|ftp://ftp.gnu.org|$)' \
        glib-gettextize --copy --force