From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Fri, 5 Mar 2010 09:12:13 +0000 (+0000)
Subject: - Fixed bug #49267 (linking fails for iconv)
X-Git-Tag: php-5.2.14RC1~111
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d8172d4a9c491f147e15dfab325ef6574766177;p=php

- Fixed bug #49267 (linking fails for iconv)
---

diff --git a/NEWS b/NEWS
index 7eb17c121d..b513f864a0 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ PHP                                                                        NEWS
   an invalid option is provided). (Ilia)
 - Fixed bug #51086 (DBA DB4 doesn't work with Berkeley DB 4.8). (Chris Jones)
 - Fixed bug #51062 (DBA DB4 uses mismatched headers and libraries). (Chris Jones)
+- Fixed bug #49267 (Linking fails for iconv). (Moriyosh)
 - Fixed bug #43314 (iconv_mime_encode(), broken Q scheme). (Rasmus)
 - Fixed bug #23229 (syslog function truncates messages). (Adam)
 
diff --git a/acinclude.m4 b/acinclude.m4
index f022a8a75d..0d5eda2dbf 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2424,6 +2424,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [
   echo > ext/iconv/php_have_libiconv.h
   echo > ext/iconv/php_have_iconv.h
   echo > ext/iconv/php_php_iconv_impl.h
+  echo > ext/iconv/php_have_libiconv_in_libiconv.h
   echo > ext/iconv/php_php_iconv_h_path.h
   echo > ext/iconv/php_iconv_supports_errno.h
 
@@ -2471,6 +2472,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [
         found_iconv=yes
         PHP_DEFINE(HAVE_LIBICONV,1,[ext/iconv])
         AC_DEFINE(HAVE_LIBICONV,1,[ ])
+        PHP_DEFINE([HAVE_LIBICONV_IN_LIBICONV],1,[ext/iconv])
+        AC_DEFINE([HAVE_LIBICONV_IN_LIBICONV],1,[iconv() is aliased to libiconv() in -liconv])
       ], [
         PHP_CHECK_LIBRARY($iconv_lib_name, iconv, [
           found_iconv=yes
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index c7277b0e9b..4960c5804b 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -193,7 +193,7 @@ static PHP_GINIT_FUNCTION(iconv)
 }
 /* }}} */
 
-#ifdef HAVE_LIBICONV
+#if defined(HAVE_LIBICONV) && defined(HAVE_LIBICONV_IN_LIBICONV)
 #define iconv libiconv
 #endif
 
diff --git a/ext/iconv/php_iconv.h b/ext/iconv/php_iconv.h
index 66ef8d5605..28524c17c7 100644
--- a/ext/iconv/php_iconv.h
+++ b/ext/iconv/php_iconv.h
@@ -35,6 +35,7 @@
 #ifdef PHP_ATOM_INC
 #include "ext/iconv/php_have_iconv.h"
 #include "ext/iconv/php_have_libiconv.h"
+#include "ext/iconv/php_have_libiconv_in_libiconv.h"
 #include "ext/iconv/php_have_glibc_iconv.h"
 #include "ext/iconv/php_have_bsd_iconv.h"
 #include "ext/iconv/php_iconv_supports_errno.h"