summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKalle Sommer Nielsen <kalle@php.net>2010-03-08 14:04:35 +0000
committerKalle Sommer Nielsen <kalle@php.net>2010-03-08 14:04:35 +0000
commitb961634c5a28c401d81ed473c064ca9ad8114a8e (patch)
tree977bb5d84762364e68d218c771382e566715b8ca
parent48adfafab8a347c2b1b62292e013f30af52feb9f (diff)
downloadphp-git-b961634c5a28c401d81ed473c064ca9ad8114a8e.tar.gz
Fix linking of iconv on Windows
-rw-r--r--ext/iconv/config.w321
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/iconv/config.w32 b/ext/iconv/config.w32
index b78c540021..6baa182c03 100644
--- a/ext/iconv/config.w32
+++ b/ext/iconv/config.w32
@@ -12,6 +12,7 @@ if (PHP_ICONV != "no") {
AC_DEFINE("HAVE_ICONV", 1, "Define if iconv extension is enabled");
AC_DEFINE("HAVE_LIBICONV", 1, "Define if libiconv is available");
+ AC_DEFINE("HAVE_LIBICONV_IN_LIBICONV", 1, "The iconv function is called iconv() in libiconv");
AC_DEFINE("PHP_ICONV_IMPL", "\"libiconv\"", "Which iconv implementation to use");
AC_DEFINE("ICONV_SUPPORTS_ERRNO", 1, "Whether iconv supports errno or not");
ADD_FLAG("CFLAGS_ICONV", "/D PHP_ICONV_EXPORTS ");