Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed Bug #63361 Header not installed
This commit is contained in:
Remi Collet 2012-11-25 07:48:44 +01:00
commit c5d4ee9bed

View File

@ -81,5 +81,8 @@ if test "$PHP_MYSQLI" != "no"; then
if test "$PHP_MYSQLI" = "yes" || test "$PHP_MYSQLI" = "mysqlnd"; then
PHP_ADD_EXTENSION_DEP(mysqli, mysqlnd)
AC_DEFINE([MYSQLI_USE_MYSQLND], 1, [Whether mysqlnd is enabled])
PHP_INSTALL_HEADERS([ext/mysqli/mysqli_mysqlnd.h])
else
PHP_INSTALL_HEADERS([ext/mysqli/mysqli_libmysql.h])
fi
fi