felipe Mon, 12 Jul 2010 13:52:43 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=301193
Log:
- Removed Bison checks
- Removed TSRMLS_FETCH() call in zend_ini_parser %syntax_error
Changed paths:
U php/php-src/branches/LEMON/Zend/acinclude.m4
U php/php-src/branches/LEMON/Zend/zend_ini_parser.y
U php/php-src/branches/LEMON/acinclude.m4
U php/php-src/branches/LEMON/configure.in
U php/php-src/branches/LEMON/win32/build/config.w32
Modified: php/php-src/branches/LEMON/Zend/acinclude.m4
===================================================================
--- php/php-src/branches/LEMON/Zend/acinclude.m4 2010-07-12 13:48:52 UTC
(rev 301192)
+++ php/php-src/branches/LEMON/Zend/acinclude.m4 2010-07-12 13:52:43 UTC
(rev 301193)
@@ -2,39 +2,6 @@
dnl
dnl This file contains local autoconf functions.
-AC_DEFUN([LIBZEND_BISON_CHECK],[
- # we only support certain bison versions
- bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2"
-
- # for standalone build of Zend Engine
- test -z "$SED" && SED=sed
-
- bison_version=none
- if test "$YACC"; then
- AC_CACHE_CHECK([for bison version], php_cv_bison_version, [
- bison_version_vars=`bison --version 2> /dev/null | grep 'GNU Bison' |
cut -d ' ' -f 4 | $SED -e 's/\./ /' | tr -d a-z`
- php_cv_bison_version=invalid
- if test -n "$bison_version_vars"; then
- set $bison_version_vars
- bison_version="${1}.${2}"
- for bison_check_version in $bison_version_list; do
- if test "$bison_version" = "$bison_check_version"; then
- php_cv_bison_version="$bison_check_version (ok)"
- break
- fi
- done
- fi
- ])
- fi
- case $php_cv_bison_version in
- ""|invalid[)]
- bison_msg="bison versions supported for regeneration of the Zend/PHP
parsers: $bison_version_list (found: $bison_version)."
- AC_MSG_WARN([$bison_msg])
- YACC="exit 0;"
- ;;
- esac
-])
-
AC_DEFUN([ZEND_FP_EXCEPT],[
AC_CACHE_CHECK(whether fp_except is defined, ac_cv_type_fp_except,[
AC_TRY_COMPILE([
Modified: php/php-src/branches/LEMON/Zend/zend_ini_parser.y
===================================================================
--- php/php-src/branches/LEMON/Zend/zend_ini_parser.y 2010-07-12 13:48:52 UTC
(rev 301192)
+++ php/php-src/branches/LEMON/Zend/zend_ini_parser.y 2010-07-12 13:52:43 UTC
(rev 301193)
@@ -37,6 +37,7 @@
#define ZEND_INI_PARSER_ARG (CG(ini_parser_param))->arg
#define ZEND_INI_PARSER_SE (CG(ini_parser_param))->syntax_error
+int ini_parse(TSRMLS_D);
void *zend_ini_parseAlloc(void *(*mallocProc)(size_t));
void zend_ini_parseFree(void *p, void (*freeProc)(void*));
void zend_ini_parse(void *yyp, int yymajor, zval yyminor TSRMLS_DC);
@@ -249,7 +250,6 @@
char *error_buf;
int error_buf_len;
char *currently_parsed_filename;
- TSRMLS_FETCH();
ZEND_INI_PARSER_SE = 1;
Modified: php/php-src/branches/LEMON/acinclude.m4
===================================================================
--- php/php-src/branches/LEMON/acinclude.m4 2010-07-12 13:48:52 UTC (rev
301192)
+++ php/php-src/branches/LEMON/acinclude.m4 2010-07-12 13:52:43 UTC (rev
301193)
@@ -2086,17 +2086,6 @@
])
dnl
-dnl PHP_PROG_BISON
-dnl
-dnl Search for bison and check it's version
-dnl
-AC_DEFUN([PHP_PROG_BISON], [
- AC_PROG_YACC
- LIBZEND_BISON_CHECK
- PHP_SUBST(YACC)
-])
-
-dnl
dnl PHP_PROG_LEX
dnl
dnl Search for (f)lex and check it's version
Modified: php/php-src/branches/LEMON/configure.in
===================================================================
--- php/php-src/branches/LEMON/configure.in 2010-07-12 13:48:52 UTC (rev
301192)
+++ php/php-src/branches/LEMON/configure.in 2010-07-12 13:52:43 UTC (rev
301193)
@@ -148,19 +148,8 @@
dnl Checks for some support/generator progs
PHP_PROG_AWK
-PHP_PROG_BISON
-PHP_PROG_LEMON
PHP_PROG_RE2C
-dnl Check if bison generated files exist when bison does not..
-case $php_cv_bison_version in
- ""|invalid[)]
- if ! test -f "$abs_srcdir/Zend/zend_language_parser.h" || ! test -f
"$abs_srcdir/Zend/zend_language_parser.c" ; then
- AC_MSG_ERROR([bison is required to build PHP/Zend when building a SVN
checkout!])
- fi
- ;;
-esac
-
PHP_ARG_ENABLE(re2c-cgoto, whether to enable computed goto gcc extension with
re2c,
[ --enable-re2c-cgoto Enable -g flag to re2c to use computed goto gcc
extension], no, no)
Modified: php/php-src/branches/LEMON/win32/build/config.w32
===================================================================
--- php/php-src/branches/LEMON/win32/build/config.w32 2010-07-12 13:48:52 UTC
(rev 301192)
+++ php/php-src/branches/LEMON/win32/build/config.w32 2010-07-12 13:52:43 UTC
(rev 301193)
@@ -46,9 +46,6 @@
// we don't want to define LIB, as that will override the default library path
// that is set in that env var
PATH_PROG('lib', null, 'MAKE_LIB');
-if (!PATH_PROG('bison')) {
- ERROR('bison is required')
-}
// There's a minimum requirement for re2c..
MINRE2C = "0.13.4";
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
