Drop support for autoconf < 2.60 in trunk and the

new PHP_5_4 branch. autoconf >= 2.60 should finally
be working now.

1 files changed, 4 insertions, 12 deletions

diff --git a/build/buildcheck.sh b/build/buildcheck.sh
index 4d76bf24d4..2815e3e0e6 100755
--- a/build/buildcheck.sh
+++ b/build/buildcheck.sh
@@ -28,32 +28,24 @@ if test -z "$PHP_AUTOCONF"; then
   PHP_AUTOCONF='autoconf'
 fi
 
-# autoconf 2.13 or newer
+# autoconf 2.60 or newer
 ac_version=`$PHP_AUTOCONF --version 2>/dev/null|head -n 1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
 if test -z "$ac_version"; then
 echo "buildconf: autoconf not found."
-echo "           You need autoconf version 2.13 or newer installed"
+echo "           You need autoconf version 2.60 or newer installed"
 echo "           to build PHP from SVN."
 exit 1
 fi
 IFS=.; set $ac_version; IFS=' '
-if test "$1" = "2" -a "$2" -lt "13" || test "$1" -lt "2"; then
+if test "$1" = "2" -a "$2" -lt "60" || test "$1" -lt "2"; then
 echo "buildconf: autoconf version $ac_version found."
-echo "           You need autoconf version 2.13 or newer installed"
+echo "           You need autoconf version 2.60 or newer installed"
 echo "           to build PHP from SVN."
 exit 1
 else
 echo "buildconf: autoconf version $ac_version (ok)"
 fi
 
-if test "$1" = "2" && test "$2" -ge "50"; then
-  echo "buildconf: Your version of autoconf likely contains buggy cache code."
-  echo "           Running vcsclean for you."
-  echo "           To avoid this, install autoconf-2.13."
-  ./vcsclean
-  stamp=
-fi
-
 test -n "$stamp" && touch $stamp
 
 exit 0