summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWez Furlong <wez@php.net>2005-06-05 19:25:01 +0000
committerWez Furlong <wez@php.net>2005-06-05 19:25:01 +0000
commite9d474dc013fe69c1e4befb10d32e50674f2c410 (patch)
treed946ed886eb28b0e37fa92ccab74379c521c431a
parent05cec1dbce98c8a446903c2d1a97549743b5818a (diff)
downloadphp-git-e9d474dc013fe69c1e4befb10d32e50674f2c410.tar.gz
fixes for #33251
-rw-r--r--ext/mysql/config.w323
-rw-r--r--ext/mysqli/config.w322
-rw-r--r--ext/pgsql/config.w322
3 files changed, 4 insertions, 3 deletions
diff --git a/ext/mysql/config.w32 b/ext/mysql/config.w32
index 87d044d753..95f689e1d6 100644
--- 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 3daaa4b097..789112ea14 100644
--- 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 8f4b8a955b..47c80ffebf 100644
--- 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");