Commit:    8d2c44b59dfc6c5c608121546edac5840def3f9a
Author:    Remi Collet <r...@php.net>         Sun, 25 Nov 2012 07:46:02 +0100
Parents:   137503dd6fe74eda49b4c63102c8919079471e39
Branches:  PHP-5.4

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=8d2c44b59dfc6c5c608121546edac5840def3f9a

Log:
Fixed Bug #63361 Header not installed

ext/mysqli/php_mysqli_structs.h is installed and includes
mysqli_mysqlnd.h or mysqli_libmysql.h. So this header must also
be installed.

Bugs:
https://bugs.php.net/63361

Changed paths:
  M  NEWS
  M  ext/mysqli/config.m4


Diff:
diff --git a/NEWS b/NEWS
index c2417a9..4dde872 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,9 @@ PHP                                                             
           NEWS
 - Imap:
   . Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array (Remi)
 
+- mysqli:
+  . Fixed bug #63361 missing header. (Remi)
+
 - Pdo_sqlite:
   . Fixed Bug #63149 getColumnMeta should return the table name
     when system SQLite used. (Remi)
diff --git a/ext/mysqli/config.m4 b/ext/mysqli/config.m4
index 6ec9334..687b422 100644
--- a/ext/mysqli/config.m4
+++ b/ext/mysqli/config.m4
@@ -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


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to