Sync mysqlnd with HEAD. Same sources as in 5_3

1 files changed, 15 insertions, 21 deletions

diff --git a/ext/mysqlnd/config.w32 b/ext/mysqlnd/config.w32
index 9174fe11d3..99a702f1f0 100644
--- a/ext/mysqlnd/config.w32
+++ b/ext/mysqlnd/config.w32
@@ -1,26 +1,20 @@
 // $Id$
 // vim:ft=javascript
 
-ARG_WITH("mysqli", "MySQLi support", "no");
-ARG_ENABLE("mysqlnd", "MySQLi with mysqlnd support", "no");
-
-if (PHP_MYSQLI == "mysqlnd" || PHP_MYSQL == "mysqlnd") {
+mysqld_source = "";
+if (CHECK_LIB("ws2_32.lib", "mysqlnd")) {
 	mysqlnd_source = 
-      "mysqlnd.c " +
-      "mysqlnd_debug.c " +
-      "mysqlnd_charset.c " +
-      "mysqlnd_loaddata.c " +
-      "mysqlnd_palloc.c " +
-      "mysqlnd_ps.c " +
-      "mysqlnd_ps_codec.c " +
-      "mysqlnd_qcache.c " +
-      "mysqlnd_result.c " +
-      "mysqlnd_result_meta.c " +
-      "mysqlnd_statistics.c " +
-      "mysqlnd_wireprotocol.c";
-	if (CHECK_LIB("ws2_32.lib", "mysqlnd")) {
-		EXTENSION("mysqlnd", mysqlnd_source);
-	    AC_DEFINE('HAVE_MYSQLND', 1, 'MySQL native driver support enabled');
-	}
+		"mysqlnd.c " +
+		"mysqlnd_debug.c " +
+		"mysqlnd_charset.c " +
+		"mysqlnd_loaddata.c " +
+		"mysqlnd_palloc.c " +
+		"mysqlnd_ps.c " +
+		"mysqlnd_ps_codec.c " +
+		"mysqlnd_qcache.c " +
+		"mysqlnd_result.c " +
+		"mysqlnd_result_meta.c " +
+		"mysqlnd_statistics.c " +
+		"mysqlnd_wireprotocol.c";
+	EXTENSION("mysqlnd", mysqlnd_source, false);
 }
-