MFB: Remove pecl includes (Steph), except pdo_odbc which will remain broke

diff --git a/ext/pdo_dblib/config.w32 b/ext/pdo_dblib/config.w32
index 1d0a83a207dc70dc3881e67eb292e9b0abbc8241..7ab90af0c13ed1e9c4b00a6684ffc612a5510d4c 100755 (executable)
--- a/ext/pdo_dblib/config.w32
+++ b/ext/pdo_dblib/config.w32
@@ -12,7 +12,7 @@ if (PHP_PDO_DBLIB != "no") {
                                PHP_PDO_DBLIB, null, null, true))
        {
                EXTENSION("pdo_dblib", "pdo_dblib.c dblib_driver.c dblib_stmt.c");
-               ADD_FLAG('CFLAGS_PDO_DBLIB', "/I pecl /I ..\\pecl /D PDO_DBLIB_FLAVOUR=\\\"freetds\\\"");
+               ADD_FLAG('CFLAGS_PDO_DBLIB', "/D PDO_DBLIB_FLAVOUR=\\\"freetds\\\"");
        }
        ADD_EXTENSION_DEP('pdo_dblib', 'pdo');
 }
@@ -63,7 +63,7 @@ if (PHP_PDO_MSSQL != "no") {
                        ADD_FLAG("CFLAGS_PDO_MSSQL", "/DPDO_DBLIB_IS_MSSQL=" + PDO_DBLIB_FLAVOUR);
                        PDO_DBLIB_FLAVOUR = "MSSQL_" + PDO_DBLIB_FLAVOUR;
                }
-               ADD_FLAG('CFLAGS_PDO_MSSQL', "/I pecl /I ..\\pecl /D PDO_DBLIB_FLAVOUR=\\\"" + PDO_DBLIB_FLAVOUR + "\\\"");
+               ADD_FLAG('CFLAGS_PDO_MSSQL', "/D PDO_DBLIB_FLAVOUR=\\\"" + PDO_DBLIB_FLAVOUR + "\\\"");
        }
        ADD_EXTENSION_DEP('pdo_mssql', 'pdo');
 }

diff --git a/ext/pdo_firebird/config.w32 b/ext/pdo_firebird/config.w32
index 30b87c2d1d63d0e738c693f5248636161e990e5c..b28a89e2eac1899328ee0ec4258cb6161a2e7427 100644 (file)
--- a/ext/pdo_firebird/config.w32
+++ b/ext/pdo_firebird/config.w32
@@ -10,7 +10,6 @@ if (PHP_PDO_FIREBIRD != "no") {
                ) && CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_PDO_FIREBIRD", PHP_PHP_BUILD + "\\interbase\\include;" + PHP_PDO_FIREBIRD)) {
 
                EXTENSION("pdo_firebird", "pdo_firebird.c firebird_driver.c firebird_statement.c");
-               ADD_FLAG('CFLAGS_PDO_FIREBIRD', "/I ..\\pecl");
        } else {
                WARNING("pdo_firebird not enabled; libraries and headers not found");
        }

diff --git a/ext/pdo_mysql/config.w32 b/ext/pdo_mysql/config.w32
index 24b2f7cf53513281d24f17a480370d341be8fc13..1fce9e5dbfb6676cbd65d64dd78299a4ccf02a8a 100644 (file)
--- a/ext/pdo_mysql/config.w32
+++ b/ext/pdo_mysql/config.w32
@@ -7,7 +7,6 @@ if (PHP_PDO_MYSQL != "no") {
        if (CHECK_LIB("libmysql.lib", "pdo_mysql", PHP_PDO_MYSQL) &&
                        CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_PDO_MYSQL", PHP_PHP_BUILD + "\\include\\mysql;" + PHP_PDO_MYSQL)) {
                EXTENSION("pdo_mysql", "pdo_mysql.c mysql_driver.c mysql_statement.c");
-               ADD_FLAG('CFLAGS_PDO_MYSQL', "/I ..\\pecl");
        } else {
                WARNING("pdo_mysql not enabled; libraries and headers not found");
        }

diff --git a/ext/pdo_oci/config.w32 b/ext/pdo_oci/config.w32
index 1e0729e47dfa97a9cdb675448c0cdbdbff1b8528..0feb0b1457e95eb93603b564e5a749ba311db9dd 100755 (executable)
--- a/ext/pdo_oci/config.w32
+++ b/ext/pdo_oci/config.w32
@@ -32,7 +32,6 @@ if (PHP_PDO_OCI != "no") {
                pdo_oci_inc_dir = FSO.GetParentFolderName(pdo_oci_header);
 
                EXTENSION('pdo_oci', 'pdo_oci.c oci_driver.c oci_statement.c');
-               ADD_FLAG('CFLAGS_PDO_OCI', "/I ..\\pecl");
 
                /* probe for some functions not present in older versions */
                pdo_oci_inc_dir = FSO.GetFolder(pdo_oci_header);
@@ -70,7 +69,6 @@ if (PHP_PDO_OCI8 != "no") {
                pdo_oci_inc_dir = FSO.GetParentFolderName(pdo_oci_header);
 
                EXTENSION('pdo_oci8', 'pdo_oci.c oci_driver.c oci_statement.c', null, null, null, "ext\\pdo_oci8");
-               ADD_FLAG('CFLAGS_PDO_OCI8', "/I ..\\pecl");
 
                /* probe for some functions not present in older versions */
                pdo_oci_inc_dir = FSO.GetFolder(pdo_oci_header);

diff --git a/ext/pdo_pgsql/config.w32 b/ext/pdo_pgsql/config.w32
index 3c74c9bf004aafc2625286ff498e38483d1a97e7..597256427b4e8336d069bf962c8166fd92d86788 100644 (file)
--- a/ext/pdo_pgsql/config.w32
+++ b/ext/pdo_pgsql/config.w32
@@ -12,7 +12,6 @@ if (PHP_PDO_PGSQL != "no") {
                        ADD_FLAG('CFLAGS_PDO_PGSQL', "/D HAVE_PG_CONFIG_H");
                }
 
-               ADD_FLAG('CFLAGS_PDO_PGSQL', "/I ..\\pecl");
                AC_DEFINE('HAVE_PDO_PGSQL', 1, 'Have PostgreSQL library');
                ADD_FLAG('CFLAGS_PDO_PGSQL', "/D HAVE_PQPARAMETERSTATUS=1 /D HAVE_PQPROTOCOLVERSION=1 /D HAVE_PGTRANSACTIONSTATUS=1 /D HAVE_PQUNESCAPEBYTEA=1 /D HAVE_PQRESULTERRORFIELD=1");
        } else {

diff --git a/ext/pdo_sqlite/config.w32 b/ext/pdo_sqlite/config.w32
index fed572403a778796ed359d88cdfdd62f3396bbd0..11f09e3507b7c3a5418833c255b67806b69ca1cb 100644 (file)
--- a/ext/pdo_sqlite/config.w32
+++ b/ext/pdo_sqlite/config.w32
@@ -19,7 +19,7 @@ if (PHP_PDO_SQLITE != "no") {
        FSO.CopyFile(configure_module_dirname + "\\sqlite\\src\\sqlite_config.w32.h",
                configure_module_dirname + "\\sqlite\\src\\config.h");
                
-       EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c sqlite_statement.c", null, "/DSQLITE_OMIT_CURSOR /I" + configure_module_dirname + "/sqlite/src /I pecl /I ..\\pecl /I" + configure_module_dirname);
+       EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c sqlite_statement.c", null, "/DSQLITE_OMIT_CURSOR /I" + configure_module_dirname + "/sqlite/src /I" + configure_module_dirname);
        ADD_SOURCES(configure_module_dirname + "/sqlite/src",
                "attach.c auth.c btree.c build.c callback.c date.c delete.c expr.c func.c hash.c insert.c \
                 legacy.c main.c os_mac.c os_unix.c os_win.c pager.c pragma.c prepare.c printf.c random.c \