diff options
| author | Andrey Hristov <andrey@php.net> | 2007-10-05 21:23:56 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2007-10-05 21:23:56 +0000 |
| commit | 8b9b553aa264d3c0afe611f49499e787004983c7 (patch) | |
| tree | 840ea2b1127ec97a63f36ffda689a1a1fe5fb975 /ext/mysql/config.w32 | |
| parent | 9f9495a48483aac9f6bc92ceea5841a8d243e2aa (diff) | |
| download | php-git-8b9b553aa264d3c0afe611f49499e787004983c7.tar.gz | |
Import mysqlnd
Patch ext/mysql and ext/mysqli to support mysqlnd
Diffstat (limited to 'ext/mysql/config.w32')
| -rw-r--r-- | ext/mysql/config.w32 | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/ext/mysql/config.w32 b/ext/mysql/config.w32 index 95f689e1d6..45fc13c8d1 100644 --- a/ext/mysql/config.w32 +++ b/ext/mysql/config.w32 @@ -4,12 +4,17 @@ ARG_WITH("mysql", "MySQL support", "no"); if (PHP_MYSQL != "no") { - if (CHECK_LIB("libmysql.lib", "mysql", PHP_MYSQL) && + if (PHP_MYSQLI != "mysqlnd") { + 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'); + PHP_MYSQL + "\\include;" + PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQL)) { + } else { + WARNING("mysql not enabled; libraries and headers not found"); + } } else { - WARNING("mysql not enabled; libraries and headers not found"); + 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'); } |