From: Remi Collet <remi@php.net>
Date: Sun, 25 Nov 2012 06:46:02 +0000 (+0100)
Subject: Fixed Bug #63361 Header not installed
X-Git-Tag: php-5.4.10RC1~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8d2c44b59dfc6c5c608121546edac5840def3f9a;p=php

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.
---

diff --git a/NEWS b/NEWS
index c2417a92c2..4dde872f22 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 6ec9334639..687b422898 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