cvs: ZendEngine2 / Zend.m4 php-src acinclude.m4

sniper Sun Feb 27 07:42:28 2005 EDT Modified files: /php-src acinclude.m4 /ZendEngine2 Zend.m4 Log: - Cache the version check results # ..and prepare for --enable-developer-mode http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.293&r2=1.294&ty=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.293 php-src/acinclude.m4:1.294 --- php-src/acinclude.m4:1.293 Thu Feb 24 14:27:10 2005 +++ php-src/acinclude.m4 Sun Feb 27 07:42:27 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.293 2005/02/24 19:27:10 sniper Exp $ +dnl $Id: acinclude.m4,v 1.294 2005/02/27 12:42:27 sniper Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -1933,16 +1933,22 @@ dnl AC_DEFUN([PHP_PROG_BISON], [ AC_PROG_YACC - if test "$YACC" != "bison -y"; then - AC_MSG_WARN([You will need bison 1.28, 1.35, 1.75 or 1.875 if you want to regenerate the Zend/PHP parsers.]) - else - AC_MSG_CHECKING([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 - AC_MSG_WARN([You will need bison 1.28, 1.35, 1.75 or 1.875 if you want to regenerate the Zend/PHP parsers (found ${1}.${2}).]) - fi - AC_MSG_RESULT(${1}.${2} (ok)) + 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 + php_cv_bison_version="${1}.${2} (ok)" + fi + ]) fi + case $php_cv_bison_version in + ""|invalid[)] + AC_MSG_WARN([You will need bison 1.28, 1.35, 1.75 or 1.875 if you want to regenerate the Zend/PHP parsers (found ${1}.${2}).]) + YACC="exit 0;" + ;; + esac PHP_SUBST(YACC) ]) @@ -1965,19 +1971,25 @@ LEX_CFLAGS="-DYY_USE_CONST" fi - AC_MSG_CHECKING([flex version]) if test "$LEX" ;then - flexvers=echo "" | $LEX -V -v --version 2>/dev/null | sed -e 's/^.* //' -e 's/\./ /g' - if test ! -z "$flexvers"; then - set $flexvers - if test "${1}" != "2" -o "${2}" != "5" -o "${3}" != "4"; then - AC_MSG_WARN([You will need flex 2.5.4 if you want to regenerate Zend/PHP lexical parsers.]) + AC_CACHE_CHECK([for flex version], php_cv_flex_version, [ + flexvers=echo "" | $LEX -V -v --version 2>/dev/null | sed -e 's/^.* //' -e 's/\./ /g' + if test ! -z "$flexvers"; then + set $flexvers + if test "${1}" != "2" -o "${2}" != "5" -o "${3}" != "4"; then + php_cv_flex_version=invalid + else + php_cv_flex_version="${1}.${2}.${3} (ok)" + fi fi - fi - AC_MSG_RESULT(${1}.${2}.${3} (ok)) - else - AC_MSG_WARN([You will need flex 2.5.4 or later if you want to regenerate Zend/PHP lexical parsers.]) + ]) fi + case $php_cv_flex_version in + ""|invalid[)] + AC_MSG_WARN([You will need flex 2.5.4 if you want to regenerate Zend/PHP lexical parsers.]) + LEX="exit 0;" + ;; + esac PHP_SUBST(LEX) ]) @@ -1989,19 +2001,21 @@ AC_DEFUN([PHP_PROG_RE2C],[ AC_CHECK_PROG(RE2C, re2c, re2c) if test -n "$RE2C"; then - AC_MSG_CHECKING([re2c version]) - AC_CACHE_VAL(php_cv_re2c_version, [ - if test echo "" | re2c --vernum 2>/dev/null -lt "904"; then - AC_MSG_WARN([You will need re2c 0.94 or later if you want to regenerate PHP parsers.]) + AC_CACHE_CHECK([for re2c version], php_cv_re2c_version, [ + re2c_vernum=echo "" | re2c --vernum 2>/dev/null + if test -z "$rec2_vernum" || test "$re2c_vernum" -lt "904"; then php_cv_re2c_version=invalid else php_cv_re2c_version="echo "" | re2c --version | cut -d ' ' -f 2 2>/dev/null (ok)" fi ]) - AC_MSG_RESULT([$php_cv_re2c_version]) - else - AC_MSG_WARN([You will need re2c 0.94 or later if you want to regenerate PHP parsers.]) fi + case $php_cv_re2c_version in + ""|invalid[)] + AC_MSG_WARN([You will need re2c 0.94 or later if you want to regenerate PHP parsers.]) + RE2C="exit 0;" + ;; + esac PHP_SUBST(RE2C) ]) http://cvs.php.net/diff.php/ZendEngine2/Zend.m4?r1=1.51&r2=1.52&ty=u Index: ZendEngine2/Zend.m4 diff -u ZendEngine2/Zend.m4:1.51 ZendEngine2/Zend.m4:1.52 --- ZendEngine2/Zend.m4:1.51 Wed Feb 23 02:50:28 2005 +++ ZendEngine2/Zend.m4 Sun Feb 27 07:42:28 2005 @@ -1,22 +1,26 @@ dnl -dnl $Id: Zend.m4,v 1.51 2005/02/23 07:50:28 sniper Exp $ +dnl $Id: Zend.m4,v 1.52 2005/02/27 12:42:28 sniper Exp $ dnl dnl This file contains Zend specific autoconf functions. dnl AC_DEFUN([LIBZEND_BISON_CHECK],[ - -if test "$YACC" != "bison -y"; then - AC_MSG_WARN(You will need bison if you want to regenerate the Zend parser.) -else - AC_MSG_CHECKING(bison version) - set bison --version| grep 'GNU Bison' | cut -d ' ' -f 4 | sed -e 's/\./ /' | tr -d 'a-z' - if test "${1}" = "1" -a "${2}" -lt "28"; then - AC_MSG_WARN(You will need bison 1.28 if you want to regenerate the Zend parser (found ${1}.${2}).) - fi - AC_MSG_RESULT(${1}.${2} (ok)) -fi - + 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}" = "1" -a "${2}" -lt "28"; then + php_cv_bison_version=invalid + else + php_cv_bison_version="${1}.${2} (ok)" + fi + ]) + fi + case $php_cv_bison_version in + ""|invalid[)] + AC_MSG_WARN([You will need bison 1.28, 1.35, 1.75 or 1.875 if you want to regenerate the Zend parsers (found ${1}.${2}).]) + YACC="exit 0;" + ;; + esac ]) AC_DEFUN([LIBZEND_CHECK_INT_TYPE],[