cvs: php-src(PHP_5_3) /ext/xmlrpc config.m4

scottmac Mon Apr 27 17:49:32 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/xmlrpc config.m4 Log: MFH Fix bug #47695 - xmlrpc --with-iconv-dir mangles --with-iconv if they use different iconv versions. Could also just add a dependency on iconv to fix this. http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/config.m4?r1=1.25.2.3&r2=1.25.2.3.4.1&diff_format=u Index: php-src/ext/xmlrpc/config.m4 diff -u php-src/ext/xmlrpc/config.m4:1.25.2.3 php-src/ext/xmlrpc/config.m4:1.25.2.3.4.1 --- php-src/ext/xmlrpc/config.m4:1.25.2.3 Tue Nov 29 18:26:02 2005 +++ php-src/ext/xmlrpc/config.m4 Mon Apr 27 17:49:32 2009 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.25.2.3 2005/11/29 18:26:02 tony2001 Exp $ +dnl $Id: config.m4,v 1.25.2.3.4.1 2009/04/27 17:49:32 scottmac Exp $ dnl sinclude(ext/xmlrpc/libxmlrpc/acinclude.m4) @@ -61,17 +61,21 @@ fi fi - if test "$PHP_ICONV_DIR" != "no"; then - PHP_ICONV=$PHP_ICONV_DIR - fi + dnl if iconv is shared or missing then we should build iconv ourselves + if test "$PHP_ICONV_SHARED" = "yes" || test "$PHP_ICONV" = "no"; then + + if test "$PHP_ICONV_DIR" != "no"; then + PHP_ICONV=$PHP_ICONV_DIR + fi - if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then - PHP_ICONV=yes - fi + if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then + PHP_ICONV=yes + fi - PHP_SETUP_ICONV(XMLRPC_SHARED_LIBADD, [], [ - AC_MSG_ERROR([iconv not found, in order to build xmlrpc you need the iconv library]) - ]) + PHP_SETUP_ICONV(XMLRPC_SHARED_LIBADD, [], [ + AC_MSG_ERROR([iconv not found, in order to build xmlrpc you need the iconv library]) + ]) + fi fi if test "$PHP_XMLRPC" = "yes"; then