Fix autoconf version check script to make sure people are

not using 2.60 or higher here. It might actually work up to
2.62 or 2.64. If someone could verify that these versions
still work I can massage this further.

diff --git a/build/buildcheck.sh b/build/buildcheck.sh
index 4d76bf24d41632223e779db2eca0c84dd8f7c3ae..13d13ddb00d9b1877958846cc2e722868b49f44a 100755 (executable)
--- a/build/buildcheck.sh
+++ b/build/buildcheck.sh
@@ -42,14 +42,21 @@ echo "buildconf: autoconf version $ac_version found."
 echo "           You need autoconf version 2.13 or newer installed"
 echo "           to build PHP from SVN."
 exit 1
+fi
+
+if test "$1" = "2" -a "$2" -gt "59"; then
+  echo "buildconf: You need autoconf 2.59 or lower to build this version of PHP."
+  echo "           You are currently trying to use $ac_version"
+  echo "           Most distros have separate autoconf 2.13 or 2.59 packages."
+  echo "           On Debian/Ubuntu both autoconf2.13 and autoconf2.59 packages exist."
+  echo "           Install autoconf2.13 and set the PHP_AUTOCONF env var to "
+  echo "           autoconf2.13and try again."
+  exit 1
 else
-echo "buildconf: autoconf version $ac_version (ok)"
+  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."
+if test "$1" = "2" -a "$2" -ge "50"; then
   ./vcsclean
   stamp=
 fi