fixes for #33251

diff --git a/ext/mysql/config.w32 b/ext/mysql/config.w32
index 87d044d753b2948aee89684a7632d7699f95d832..95f689e1d6417308a179ff8c7151c3eb0bc4dd0e 100644 (file)
--- a/ext/mysql/config.w32
+++ b/ext/mysql/config.w32
@@ -5,7 +5,8 @@ ARG_WITH("mysql", "MySQL support", "no");
 
 if (PHP_MYSQL != "no") {
        if (CHECK_LIB("libmysql.lib", "mysql", PHP_MYSQL) &&
-                       CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQL", PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQL)) {
+                       CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQL",
+                               PHP_MYSQL + "\\include;" + PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQL)) {
                EXTENSION("mysql", "php_mysql.c");
                AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
        } else {

diff --git a/ext/mysqli/config.w32 b/ext/mysqli/config.w32
index 3daaa4b097ccb76cd91089d20e553956ce91d487..789112ea14407aacef07bb69f3b2a3303eef4529 100644 (file)
--- a/ext/mysqli/config.w32
+++ b/ext/mysqli/config.w32
@@ -5,7 +5,7 @@ ARG_WITH("mysqli", "MySQLi support", "no");
 
 if (PHP_MYSQLI != "no") {
        if (CHECK_LIB("libmysql.lib", "mysqli", PHP_MYSQLI) &&
-                       CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQLI", PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQLI)) {
+                       CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQLI", PHP_MYSQLI + "\\include;" + PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQLI)) {
                EXTENSION("mysqli", "mysqli.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c mysqli_fe.c mysqli_report.c mysqli_repl.c mysqli_driver.c mysqli_warning.c mysqli_exception.c mysqli_embedded.c");
                AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
        } else {

diff --git a/ext/pgsql/config.w32 b/ext/pgsql/config.w32
index 8f4b8a955b7c88357cd853b920a9ec1e3bf092df..47c80ffebfe248eff4b4b141619d710f1271611d 100644 (file)
--- a/ext/pgsql/config.w32
+++ b/ext/pgsql/config.w32
@@ -5,7 +5,7 @@ ARG_WITH("pgsql", "PostgreSQL support", "no");
 
 if (PHP_PGSQL != "no") {
        if (CHECK_LIB("libpq.lib", "pgsql", PHP_PGSQL) &&
-               CHECK_HEADER_ADD_INCLUDE("libpq-fe.h", "CFLAGS_PGSQL", PHP_PHP_BUILD + "\\include\\pgsql;" + PHP_PGSQL)) {
+               CHECK_HEADER_ADD_INCLUDE("libpq-fe.h", "CFLAGS_PGSQL", PHP_PGSQL + "\\include;" + PHP_PHP_BUILD + "\\include\\pgsql;" + PHP_PGSQL)) {
                EXTENSION("pgsql", "pgsql.c");
                AC_DEFINE('HAVE_PGSQL', 1, 'Have PostgreSQL library');
                ADD_FLAG("CFLAGS_PGSQL", "/D HAVE_PG_CONFIG_H /D PGSQL_EXPORTS /D HAVE_PQSETNONBLOCKING /D HAVE_PQCMDTUPLES /D HAVE_PQCLIENTENCODING /D HAVE_PQESCAPE /D HAVE_PQPARAMETERSTATUS /D HAVE_PGTRANSACTIONSTATUS /D HAVE_PQEXECPARAMS /D HAVE_PQPREPARE /D HAVE_PQEXECPREPARED /D HAVE_PQRESULTERRORFIELD /D HAVE_PQSENDQUERYPARAMS /D HAVE_PQSENDPREPARE /D HAVE_PQSENDQUERYPREPARED /D HAVE_PQPUTCOPYDATA /D HAVE_PQPUTCOPYEND /D HAVE_PQGETCOPYDATA /D HAVE_PQSETERRORVERBOSITY /D HAVE_PQUNESCAPEBYTEA");