diff options
| author | Andrey Hristov <andrey@php.net> | 2008-01-28 22:54:21 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2008-01-28 22:54:21 +0000 |
| commit | 6d9fdbce50d17240341119036c01303649892ddc (patch) | |
| tree | 7da94b44ce5a367b21cc8d4df46ef454bb30e4a0 /ext/mysql | |
| parent | e3492e6d01a2053956fa664a0bf5f9943ce5705e (diff) | |
| download | php-git-6d9fdbce50d17240341119036c01303649892ddc.tar.gz | |
MFB:
some config.w32 fixes
moved mysqlnd's block allocator to a separate file and also now
it's part of the connection, no MT problems.
Diffstat (limited to 'ext/mysql')
| -rw-r--r-- | ext/mysql/config.w32 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/mysql/config.w32 b/ext/mysql/config.w32 index a36ba1709c..df3f3556cb 100644 --- a/ext/mysql/config.w32 +++ b/ext/mysql/config.w32 @@ -8,13 +8,15 @@ if (PHP_MYSQL != "no") { if (CHECK_LIB("libmysql.lib", "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 { WARNING("mysql not enabled; libraries and headers not found"); } } else { AC_DEFINE('HAVE_MYSQLND', 1, 'MySQL native driver support enabled'); ADD_EXTENSION_DEP('mysql', 'mysqlnd', true); + EXTENSION("mysql", "php_mysql.c"); + AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library'); } - EXTENSION("mysql", "php_mysql.c"); - AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library'); } |