r5282: merging autogen fixes from 3_0

diff --git a/source/autogen.sh b/source/autogen.sh
index 23aedda2b5102b5644c2936621b1db54ba4711e3..3422d7cebfa5c4f87f77eb43c9f0ad77acbc8c22 100755 (executable)
--- a/source/autogen.sh
+++ b/source/autogen.sh
@@ -16,7 +16,7 @@ AUTOCONFFOUND="0"
 ##
 for i in $TESTAUTOHEADER; do
        if which $i > /dev/null 2>&1; then
-               if [ `$i --version | head -n 1 | cut -d.  -f 2` -ge 53 ]; then
+               if test `$i --version | head -n 1 | cut -d.  -f 2 | tr -d [:alpha:]` -ge 53; then
                        AUTOHEADER=$i
                        AUTOHEADERFOUND="1"
                        break
@@ -30,7 +30,7 @@ done
 
 for i in $TESTAUTOCONF; do
        if which $i > /dev/null 2>&1; then
-               if [ `$i --version | head -n 1 | cut -d.  -f 2` -ge 53 ]; then
+               if test `$i --version | head -n 1 | cut -d.  -f 2 | tr -d [:alpha:]` -ge 53; then
                        AUTOCONF=$i
                        AUTOCONFFOUND="1"
                        break
@@ -42,7 +42,7 @@ done
 ## 
 ## do we have it?
 ##
-if [ "$AUTOCONFFOUND" = "0" -o "$AUTOHEADERFOUND" = "0" ]; then
+if test "$AUTOCONFFOUND" = "0" -o "$AUTOHEADERFOUND" = "0"; then
        echo "$0: need autoconf 2.53 or later to build samba from SVN" >&2
        exit 1
 fi