Try to fix the windows build of mysqlnd

diff --git a/ext/mysqlnd/config.w32 b/ext/mysqlnd/config.w32
index a23a9d60619de680e297e356677c420fe82b7b61..301f52ef55b215ac5d9bfd26b16dab91b738ddbb 100644 (file)
--- a/ext/mysqlnd/config.w32
+++ b/ext/mysqlnd/config.w32
@@ -1,46 +1,12 @@
 // $Id$
 // 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 @@ if (PHP_MYSQLI != "no") {
         "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');
        }
   }
 }