rasmus                                   Wed, 18 May 2011 17:27:41 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=311202

Log:
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.

Changed paths:
    U   php/php-src/branches/PHP_5_3/build/buildcheck.sh

Modified: php/php-src/branches/PHP_5_3/build/buildcheck.sh
===================================================================
--- php/php-src/branches/PHP_5_3/build/buildcheck.sh    2011-05-18 16:58:31 UTC 
(rev 311201)
+++ php/php-src/branches/PHP_5_3/build/buildcheck.sh    2011-05-18 17:27:41 UTC 
(rev 311202)
@@ -42,14 +42,21 @@
 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

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to