diff options
| author | Sebastian Bergmann <sb@sebastian-bergmann.de> | 2013-07-03 06:37:04 +0200 |
|---|---|---|
| committer | Sebastian Bergmann <sb@sebastian-bergmann.de> | 2013-07-03 06:37:04 +0200 |
| commit | 74d434c091c765d2fa00fafabd383f14638f7acf (patch) | |
| tree | f9915c6f1bd76c8375000899f9d1047e4462666e | |
| parent | 67817a199ca4c8bcff163cb005287c0087db6bf3 (diff) | |
| parent | 50ac53e1b109795e3abb92735a3a35cebcdd47a7 (diff) | |
| download | php-git-74d434c091c765d2fa00fafabd383f14638f7acf.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
| -rw-r--r-- | Zend/acinclude.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/acinclude.m4 b/Zend/acinclude.m4 index 136d2d8bef..77430aba79 100644 --- a/Zend/acinclude.m4 +++ b/Zend/acinclude.m4 @@ -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 2.6 2.6.1 2.6.2" + 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 2.6.4" # for standalone build of Zend Engine test -z "$SED" && SED=sed |