scottmac Mon Apr 27 18:38:58 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/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/NEWS?r1=1.2027.2.547.2.1475&r2=1.2027.2.547.2.1476&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1475 php-src/NEWS:1.2027.2.547.2.1476
--- php-src/NEWS:1.2027.2.547.2.1475 Thu Apr 23 22:34:47 2009
+++ php-src/NEWS Mon Apr 27 18:38:57 2009
@@ -38,6 +38,8 @@
(crrodriguez at opensuse dot org, Ilia)
- Fixed bug #47704 (PHP crashes on some "bad" operations with string offsets).
(Dmitry)
+- Fixed bug #47695 (build error when xmlrpc and iconv are compiled
+ against different iconv versions). (Scott)
- Fixed bug #47667 (ZipArchive::OVERWRITE seems to have no effect).
(Mikko, Pierre)
- Fixed bug #47644 (Valid integers are truncated with json_decode()). (Scott)
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/config.m4?r1=1.25.2.3&r2=1.25.2.3.2.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.2.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 18:38:58 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.2.1 2009/04/27 18:38:58 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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
