4 files changed, 32 insertions, 24 deletions
diff --git a/ext/ereg/config.w32 b/ext/ereg/config.w32
index 9a25368df0..59cdb04685 100644
--- a/ext/ereg/config.w32
+++ b/ext/ereg/config.w32
@@ -1,7 +1,11 @@
 // $Id$
 // vim:ft=javascript
 
-EXTENSION("ereg", "ereg.c", false /* never shared */, "-Dregexec=php_regexec -Dregerror=php_regerror -Dregfree=php_regfree -Dregcomp=php_regcomp -Iext/ereg/regex");
-ADD_SOURCES("ext/ereg/regex", "regcomp.c regexec.c regerror.c regfree.c", "ereg");
-AC_DEFINE('REGEX', 1, 'Bundled regex');
-AC_DEFINE('HSREGEX', 1, 'Bundled regex');
+ARG_WITH("ereg", "POSIX extended regular expressions", "yes");
+if (PHP_EREG != "no") {
+
+	EXTENSION("ereg", "ereg.c", false /* never shared */, "-Dregexec=php_regexec -Dregerror=php_regerror -Dregfree=php_regfree -Dregcomp=php_regcomp -Iext/ereg/regex");
+	ADD_SOURCES("ext/ereg/regex", "regcomp.c regexec.c regerror.c regfree.c", "ereg");
+	AC_DEFINE('REGEX', 1, 'Bundled regex');
+	AC_DEFINE('HSREGEX', 1, 'Bundled regex');
+}
+\ No newline at end of file
diff --git a/ext/libxml/config.w32 b/ext/libxml/config.w32
index 08a06af1f1..bfac5c839a 100644
--- a/ext/libxml/config.w32
+++ b/ext/libxml/config.w32
@@ -5,7 +5,7 @@ ARG_WITH("libxml", "LibXML support", "yes");
 
 if (PHP_LIBXML == "yes") {
 	if (CHECK_LIB("libxml2_a_dll.lib;libxml2_a.lib", "libxml") &&
-			CHECK_LIB("iconv_a.lib;iconv.lib", "libxml") &&
+			CHECK_LIB("libiconv_a.lib;iconv_a.lib;libiconv.lib;iconv.lib", "libxml") &&
 			CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS")) {
 
 		EXTENSION("libxml", "libxml.c", false /* never shared */);
diff --git a/ext/mysqlnd/config.w32 b/ext/mysqlnd/config.w32
index a49a918b7f..d495672cf7 100644
--- a/ext/mysqlnd/config.w32
+++ b/ext/mysqlnd/config.w32
@@ -1,21 +1,25 @@
 // $Id$
 // vim:ft=javascript
 
-if (CHECK_LIB("ws2_32.lib", "mysqlnd")) {
-	mysqlnd_source = 
-		"mysqlnd.c " +
-		"mysqlnd_block_alloc.c " +
-		"mysqlnd_charset.c " +
-		"mysqlnd_debug.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 " +
-		"php_mysqlnd.c";
-	EXTENSION("mysqlnd", mysqlnd_source, false);
-}
+ARG_WITH("mysqlnd", "Mysql Native Client Driver", "yes");
+if (PHP_MYSQLND != "no") {
+
+	if (CHECK_LIB("ws2_32.lib", "mysqlnd")) {
+		mysqlnd_source = 
+			"mysqlnd.c " +
+			"mysqlnd_block_alloc.c " +
+			"mysqlnd_charset.c " +
+			"mysqlnd_debug.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 " +
+			"php_mysqlnd.c";
+		EXTENSION("mysqlnd", mysqlnd_source, false);
+	}
+}
+\ No newline at end of file
diff --git a/ext/zlib/config.w32 b/ext/zlib/config.w32
index 3639276c8c..d5981a99ce 100644
--- a/ext/zlib/config.w32
+++ b/ext/zlib/config.w32
@@ -6,7 +6,7 @@ ARG_ENABLE("zlib", "ZLIB support", "yes");
 if (PHP_ZLIB == "yes") {
 	EXTENSION("zlib", "zlib.c zlib_fopen_wrapper.c zlib_filter.c", null, "/D ZLIB_EXPORTS");
 	AC_DEFINE("HAVE_ZLIB", 1, "ZLIB support");
-	CHECK_LIB("zlib.lib", "zlib", PHP_ZLIB);
+	CHECK_LIB("zlib_a.lib;zlib.lib", "zlib", PHP_ZLIB);
 	CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS", "..\\zlib;" + php_usual_include_suspects);
 	if (!PHP_ZLIB_SHARED) {
 		ADD_DEF_FILE("ext\\zlib\\php_zlib.def");