From 6d5779844f17d4605505d07f6b3949c783e2c46c Mon Sep 17 00:00:00 2001 From: "Frank M. Kromann" Date: Wed, 4 Aug 2004 17:13:11 +0000 Subject: [PATCH] MFH: Move iconv exports to the iconv extension and make libxml depend on iconv --- ext/iconv/config.w32 | 4 +++- ext/libxml/config.w32 | 1 + ext/libxml/php_libxml2.def | 5 ----- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ext/iconv/config.w32 b/ext/iconv/config.w32 index ee6213a753..d6e0f8a920 100644 --- 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 2edd6aad85..711e456f43 100644 --- 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 60cdb5f55e..0dd470afce 100644 --- 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 -- 2.50.1