sniper Wed Feb 25 08:29:32 2004 EDT Modified files: /php-src/ext/mysqli config.w32 Log: Do not corrupt mysql build with mysqli build stuff. (should fix #27387) http://cvs.php.net/diff.php/php-src/ext/mysqli/config.w32?r1=1.1&r2=1.2&ty=u Index: php-src/ext/mysqli/config.w32 diff -u php-src/ext/mysqli/config.w32:1.1 php-src/ext/mysqli/config.w32:1.2 --- php-src/ext/mysqli/config.w32:1.1 Sat Feb 21 10:05:52 2004 +++ php-src/ext/mysqli/config.w32 Wed Feb 25 08:29:30 2004 @@ -1,12 +1,12 @@ -// $Id: config.w32,v 1.1 2004/02/21 15:05:52 sebastian Exp $ +// $Id: config.w32,v 1.2 2004/02/25 13:29:30 sniper Exp $ // vim:ft=javascript ARG_WITH("mysqli", "MySQLi support", "no"); if (PHP_MYSQLI != "no") { - if (CHECK_LIB("libmysql.lib", "mysql", PHP_MYSQL) && - CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQL", PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQL)) { - EXTENSION("mysql", "mysqli.c mysqli_api.c mysqli_fe.c mysqli_nonapi.c mysqli_prop.c mysqli_report.c"); + if (CHECK_LIB("libmysql.lib", "mysqli", PHP_MYSQL) && + CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQLI", PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQL)) { + EXTENSION("mysqli", "mysqli.c mysqli_api.c mysqli_fe.c mysqli_nonapi.c mysqli_prop.c mysqli_report.c"); AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library'); } else { WARNING("mysqli not enabled; libraries and headers not found");
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php