diff options
| author | Andrey Hristov <andrey@php.net> | 2008-04-08 07:45:49 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2008-04-08 07:45:49 +0000 |
| commit | 46e3d3a4d8c51545bef074688d8b2d8d27bacf83 (patch) | |
| tree | cc7c6cf7e519a9ed37d193082494e5c763bafb43 | |
| parent | f728678bb849258add7555b4f5d53f5fb43e31fd (diff) | |
| download | php-git-46e3d3a4d8c51545bef074688d8b2d8d27bacf83.tar.gz | |
Fix snapshot build
| -rw-r--r-- | ext/mysql/config.w32 | 14 | ||||
| -rw-r--r-- | ext/mysqli/config.w32 | 14 |
2 files changed, 16 insertions, 12 deletions
diff --git a/ext/mysql/config.w32 b/ext/mysql/config.w32 index e1e8fe3af4..7d202b1d1e 100644 --- a/ext/mysql/config.w32 +++ b/ext/mysql/config.w32 @@ -4,19 +4,21 @@ ARG_WITH("mysql", "MySQL support", "no"); if (PHP_MYSQL != "no") { - if (PHP_MYSQL != "mysqlnd") { + if (PHP_MYSQL == "yes" || PHP_MYSQL == "mysqlnd") { + AC_DEFINE('MYSQL_USE_MYSQLND', 1, 'Using MySQL native driver'); + ADD_EXTENSION_DEP('mysql', 'mysqlnd', true); + EXTENSION("mysql", "php_mysql.c"); + AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library'); + STDOUT.WriteLine("INFO: mysqlnd build"); + } else if (PHP_MYSQL != "") { 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'); + STDOUT.WriteLine("INFO: libmysql build"); } else { WARNING("mysql not enabled; libraries and headers not found"); } - } else { - AC_DEFINE('MYSQL_USE_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'); } } diff --git a/ext/mysqli/config.w32 b/ext/mysqli/config.w32 index 88f571e6e5..e7c418999a 100644 --- a/ext/mysqli/config.w32 +++ b/ext/mysqli/config.w32 @@ -21,20 +21,22 @@ if (PHP_MYSQLI != "no") { "mysqli_report.c " + "mysqli_warning.c"; - if (PHP_MYSQLI != "mysqlnd") { + if (PHP_MYSQLI == "yes" || PHP_MYSQLI == "mysqlnd") { + EXTENSION("mysqli", mysqli_source); + AC_DEFINE('MYSQLI_USE_MYSQLND', 1, 'Using MySQL native driver'); + AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library'); + ADD_EXTENSION_DEP('mysqli', 'mysqlnd', true); + STDOUT.WriteLine("INFO: mysqlnd build"); + } else { if (CHECK_LIB("libmysql.lib", "mysqli", PHP_MYSQLI) && CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQLI", PHP_MYSQLI + "\\include;" + PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQLI)) { EXTENSION("mysqli", mysqli_source); AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library'); + STDOUT.WriteLine("INFO: libmysql build"); } else { WARNING("mysqli not enabled; libraries and headers not found"); } - } else { - EXTENSION("mysqli", mysqli_source); - AC_DEFINE('MYSQLI_USE_MYSQLND', 1, 'MySQLi with native driver support enabled'); - AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library'); - ADD_EXTENSION_DEP('mysqli', 'mysqlnd', true); } } |