MFH: Move iconv exports to the iconv extension and make libxml depend on iconv

diff --git a/ext/iconv/config.w32 b/ext/iconv/config.w32
index ee6213a753d4274ae2f97c0ff11c66b9e132b09e..d6e0f8a9200b995107438e81bfa7d21a47fa8d4e 100644 (file)
--- a/ext/iconv/config.w32
+++ b/ext/iconv/config.w32
@@ -12,6 +12,8 @@ if (PHP_ICONV != "no") {
                AC_DEFINE("HAVE_LIBICONV", 1, "Define if libiconv is available");
                AC_DEFINE("PHP_ICONV_IMPL", "\"libiconv\"", "Which iconv implementation to use");
                AC_DEFINE("ICONV_SUPPORTS_ERRNO", 1, "Whether iconv supports errno or not");
+               if (!PHP_ICONV_SHARED) {
+                       ADD_DEF_FILE("ext\\iconv\\php_iconv.def");
+               }
        }
 }
-

diff --git a/ext/libxml/config.w32 b/ext/libxml/config.w32
index 2edd6aad85fabb9b7fe796f88ff069228f510a34..711e456f435a3713b35ab7e4671f237faad5eeba 100644 (file)
--- a/ext/libxml/config.w32
+++ b/ext/libxml/config.w32
@@ -15,6 +15,7 @@ if (PHP_LIBXML == "yes") {
                if (!PHP_LIBXML_SHARED) {
                        ADD_DEF_FILE("ext\\libxml\\php_libxml2.def");
                }
+               ADD_EXTENSION_DEP('libxml', 'iconv');
        }
 }
 

diff --git a/ext/libxml/php_libxml2.def b/ext/libxml/php_libxml2.def
index 60cdb5f55e4aca68e8bc682ba935aa8f40ca4865..0dd470afced294669872bfe7937cc209ca5b3aca 100644 (file)
--- a/ext/libxml/php_libxml2.def
+++ b/ext/libxml/php_libxml2.def
@@ -1569,8 +1569,3 @@ xmlTextWriterWritePI
 xmlTextWriterWriteRaw
 xmlTextWriterWriteRawLen
 xmlTextWriterWriteString
-_libiconv_version
-libiconv_close
-libiconv
-libiconv_open
-libiconv_set_relocation_prefix