diff options
| -rwxr-xr-x | ext/pdo_dblib/config.w32 | 4 | ||||
| -rw-r--r-- | ext/pdo_firebird/config.w32 | 1 | ||||
| -rw-r--r-- | ext/pdo_mysql/config.w32 | 1 | ||||
| -rwxr-xr-x | ext/pdo_oci/config.w32 | 2 | ||||
| -rw-r--r-- | ext/pdo_pgsql/config.w32 | 1 | ||||
| -rw-r--r-- | ext/pdo_sqlite/config.w32 | 2 |
6 files changed, 3 insertions, 8 deletions
diff --git a/ext/pdo_dblib/config.w32 b/ext/pdo_dblib/config.w32 index 1d0a83a207..7ab90af0c1 100755 --- 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 30b87c2d1d..b28a89e2ea 100644 --- 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 24b2f7cf53..1fce9e5dbf 100644 --- 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 1e0729e47d..0feb0b1457 100755 --- 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 3c74c9bf00..597256427b 100644 --- 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 fed572403a..11f09e3507 100644 --- 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 \ |