Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
	Zend/acinclude.m4
This commit is contained in:
Derick Rethans 2012-10-18 17:53:55 +01:00
commit b58d45b67f

View File

@ -4,7 +4,7 @@ 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 2.4.3 2.5 2.5.1"
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 2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2"
# for standalone build of Zend Engine
test -z "$SED" && SED=sed