andrey Thu Oct 4 09:53:19 2007 UTC
Modified files:
/php-src/ext/mysqlnd config.w32
Log:
Try to fix the windows build of mysqlnd
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config.w32?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysqlnd/config.w32
diff -u php-src/ext/mysqlnd/config.w32:1.2 php-src/ext/mysqlnd/config.w32:1.3
--- php-src/ext/mysqlnd/config.w32:1.2 Tue Oct 2 10:43:09 2007
+++ php-src/ext/mysqlnd/config.w32 Thu Oct 4 09:53:19 2007
@@ -1,46 +1,12 @@
-// $Id: config.w32,v 1.2 2007/10/02 10:43:09 andrey Exp $
+// $Id: config.w32,v 1.3 2007/10/04 09:53:19 andrey Exp $
// vim:ft=javascript
-// Note: The extension name is "mysqli", you enable it with "--with-mysqli".
-// The "--enable-mysqlnd" tells to use "mysqli", if enabled, with the bundled
-// client library to connect to the MySQL server, i.e. no external MySQL
-// client library is needed to perform the build.
-
ARG_WITH("mysqli", "MySQLi support", "no");
ARG_ENABLE("mysqlnd", "MySQLi with mysqlnd support", "no");
-if (PHP_MYSQLI != "no") {
-
- mysqli_source =
- "mysqli.c " +
- "mysqli_api.c " +
- "mysqli_driver.c " +
- "mysqli_embedded.c " +
- "mysqli_exception.c " +
- "mysqli_fe.c " +
- "mysqli_nonapi.c " +
- "mysqli_prop.c " +
- "mysqli_report.c " +
- "mysqli_warning.c";
-
- if (PHP_MYSQLND == "no") {
- 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)) {
- // No "mysqli_repl.c" when using "mysqlnd"
- mysqli_extra_sources = "mysqli_repl.c";
- EXTENSION("mysqli", mysqli_source + " " + mysqli_extra_sources);
- AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
- } else {
- WARNING("mysqli not enabled; libraries and headers not found");
- }
-
- } else {
-
+if (PHP_MYSQLI == "mysqlnd" || PHP_MYSQL == "mysqlnd") {
mysqlnd_source =
"mysqlnd.c " +
-// "mysqlnd_alloc.c " +
"mysqlnd_debug.c " +
"mysqlnd_charset.c " +
"mysqlnd_loaddata.c " +
@@ -53,14 +19,8 @@
"mysqlnd_statistics.c " +
"mysqlnd_wireprotocol.c";
if (CHECK_LIB("ws2_32.lib", "mysqlnd")) {
- EXTENSION("mysqli", mysqli_source);
- // Specify that add "mysqlnd" sources, but use same object file
- // directory as the "mysqli" sources
- // FIXME the hard coded "ext/mysqli/mysqlnd" prevents pointing
- // out sources in another directory? Like above: PHP_MYSQLI +
"\\include;"
- ADD_SOURCES("ext/mysqli/mysqlnd", mysqlnd_source, "mysqli");
- AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
- AC_DEFINE('HAVE_MYSQLND' , 1, 'MySQL native driver support
enabled');
+ EXTENSION("mysqlnd", mysqlnd_source);
+ AC_DEFINE('HAVE_MYSQLND', 1, 'MySQL native driver support enabled');
}
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
