Fixed bug #66604 'pdo/php_pdo_error.h' not copied to the include dir

diff --git a/NEWS b/NEWS
index 48afea4682a51ec12733ab63ff131b41718336ff..e98d823861f454cf51ec7476558fc1a1af1fd8f8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,10 @@ PHP                                                                        NEWS
 - mysqlnd:
   . Added a new fetching mode to mysqlnd. (Andrey)
 
+- PDO:
+  . Fixed bug #66604 ('pdo/php_pdo_error.h' not copied to the include dir).
+    (Matteo)
+
 - SQLite:
   . Fixed bug #66967 (Updated bundled libsqlite to 3.8.4.3). (Anatol)
 

diff --git a/ext/pdo/config.m4 b/ext/pdo/config.m4
index f8515ddb1d4baa2a1f9fa9e653e124e04f6061cb..786c70382abfcf7aa1c67a81ad799585820cc379 100755 (executable)
--- a/ext/pdo/config.m4
+++ b/ext/pdo/config.m4
@@ -60,7 +60,7 @@ for more detail on this issue.
   ifdef([PHP_INSTALL_HEADERS],
   [
     dnl Sadly, this is a complete NOP for pecl extensions
-    PHP_INSTALL_HEADERS(ext/pdo, [php_pdo.h php_pdo_driver.h])
+    PHP_INSTALL_HEADERS(ext/pdo, [php_pdo.h php_pdo_driver.h php_pdo_error.h])
   ])
 
   dnl so we always include the known-good working hack.

diff --git a/ext/pdo/config.w32 b/ext/pdo/config.w32
index c85f2e55e4b19281fc7da9dd613346580c4e075f..b026590980a5054190a37591147cf71c05cbb592 100755 (executable)
--- a/ext/pdo/config.w32
+++ b/ext/pdo/config.w32
@@ -6,5 +6,5 @@ ARG_ENABLE("pdo", "Enable PHP Data Objects support", "no");
 if (PHP_PDO != "no") {
        EXTENSION('pdo', 'pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c', false /* force static, PHP_PDO_SHARED is broken yet somehow */);
        ADD_EXTENSION_DEP('pdo', 'spl', true);
-       PHP_INSTALL_HEADERS("ext/pdo", "php_pdo.h php_pdo_driver.h");
+       PHP_INSTALL_HEADERS("ext/pdo", "php_pdo.h php_pdo_driver.h php_pdo_error.h");
 }