cvs: php-src / acinclude.m4

helly Sat Apr 23 07:30:12 2005 EDT Modified files: /php-src acinclude.m4 Log: - Change bison check to positive logic and allow bison 2.0 http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.299&r2=1.300&ty=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.299 php-src/acinclude.m4:1.300 --- php-src/acinclude.m4:1.299 Wed Apr 20 16:48:19 2005 +++ php-src/acinclude.m4 Sat Apr 23 07:30:11 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.299 2005/04/20 20:48:19 bfrance Exp $ +dnl $Id: acinclude.m4,v 1.300 2005/04/23 11:30:11 helly Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -1936,10 +1936,10 @@ if test "$YACC" = "bison -y"; then AC_CACHE_CHECK([for bison version], php_cv_bison_version, [ set bison --version| grep 'GNU Bison' | cut -d ' ' -f 4 | sed -e 's/\./ /'|tr -d a-z - if test "${1}" -ne "1" -o "(" "${2}" != "28" -a "${2}" != "35" -a "${2}" != "75" -a "${2}" != "875" ")"; then - php_cv_bison_version=invalid - else + if test "(" "${1}" = "1" -a "(" "${2}" = "28" -o "${2}" = "35" -o "${2}" = "75" -o "${2}" = "875" ")" ")" -o "(" "${1}" = "2" -a "(" "${2}" = "0" ")" ")"; then php_cv_bison_version="${1}.${2} (ok)" + else + php_cv_bison_version=invalid fi ]) fi