Merge branch 'PHP-7.0'

This commit is contained in:
Nikita Popov 2016-01-29 17:03:32 +01:00
commit 1c709f08c7
2 changed files with 3 additions and 3 deletions

View File

@ -14,11 +14,11 @@ PHP_ARG_ENABLE(huge-code-pages, whether to enable copying PHP CODE pages into HU
if test "$PHP_OPCACHE" != "no"; then
if test "$PHP_OPCACHE_FILE" == "yes"; then
if test "$PHP_OPCACHE_FILE" = "yes"; then
AC_DEFINE(HAVE_OPCACHE_FILE_CACHE, 1, [Define to enable file based caching (experimental)])
fi
if test "$PHP_HUGE_CODE_PAGES" == "yes"; then
if test "$PHP_HUGE_CODE_PAGES" = "yes"; then
AC_DEFINE(HAVE_HUGE_CODE_PAGES, 1, [Define to enable copying PHP CODE pages into HUGE PAGES (experimental)])
fi

View File

@ -11,7 +11,7 @@ PHP_ARG_ENABLE(phpdbg-webhelper, for phpdbg web SAPI support,
PHP_ARG_ENABLE(phpdbg-debug, for phpdbg debug build,
[ --enable-phpdbg-debug Build phpdbg in debug mode], no, no)
if test "$BUILD_PHPDBG" == "" && test "$PHP_PHPDBG" != "no"; then
if test "$BUILD_PHPDBG" = "" && test "$PHP_PHPDBG" != "no"; then
AC_HEADER_TIOCGWINSZ
AC_DEFINE(HAVE_PHPDBG, 1, [ ])