Change CMS preference widgets to not expand

[inkscape.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 16ac28c9bc6e813772a436685b797604f5c04342..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,13 +28,13 @@ cd "$srcdir"
 
 check_version ()
 {
-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;`
+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" > "$MAJOR2"))||(((("$MAJOR1" == "$MAJOR2")) && (("$MINOR1" \>= "$MINOR2")))); then
+if [ "$MAJOR1" -gt "$MAJOR2" ] || [ "$MAJOR1" -eq "$MAJOR2" -a "$MINOR1" -ge "$MINOR2" ]; then
         echo "yes (version $1)"
     else
         echo "Too old (found version $1)!"
@@ -193,7 +193,7 @@ attempt_command 'underquoted definition of|[\)\#]Extending' \
        attempt_command '' autoheader
 }
 
-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