From: foobar <sniper@php.net>
Date: Sun, 28 Aug 2005 00:46:36 +0000 (+0000)
Subject: MFH
X-Git-Tag: php-5.1.0RC2_PRE~66
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5dd6467bd03d9a86eaeb6b4f1de08407b7ef46cb;p=php

MFH
---

diff --git a/NEWS b/NEWS
index 5236165a61..da385f01bc 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,7 @@ PHP                                                                        NEWS
 - Fixed failing queries (FALSE returned) with mysqli_query() on 64 bit systems.
   (Andrey)
 - Fixed bug #34257 (lib64 not handled correctly in ming extension). (Marcus)
+- Fixed bug #34221 (Compiling xmlrpc as shared fails other parts). (Jani)
 - Fixed bug #34191 (ob_gzhandler does not enforce trailing \0). (Ilia)
 - Fixed bug #34156 (memory usage remains elevated after memory limit is 
   reached). (Ilia)
diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4
index 74ec5e4bb6..5c1dfe85ee 100644
--- a/ext/xmlrpc/config.m4
+++ b/ext/xmlrpc/config.m4
@@ -15,8 +15,8 @@ if test -z "$PHP_LIBXML_DIR"; then
   [  --with-libxml-dir=DIR     XMLRPC-EPI: libxml2 install prefix], no, no)
 fi
 
-PHP_ARG_WITH(expat-dir, libexpat dir for XMLRPC-EPI,
-[  --with-expat-dir=DIR      XMLRPC-EPI: libexpat dir for XMLRPC-EPI (deprecated)],no,no)
+PHP_ARG_WITH(libexpat-dir, libexpat dir for XMLRPC-EPI,
+[  --with-libexpat-dir=DIR   XMLRPC-EPI: libexpat dir for XMLRPC-EPI (deprecated)],no,no)
 
 PHP_ARG_WITH(iconv-dir, iconv dir for XMLRPC-EPI,
 [  --with-iconv-dir=DIR      XMLRPC-EPI: iconv dir for XMLRPC-EPI],no,no)
@@ -28,9 +28,9 @@ if test "$PHP_XMLRPC" != "no"; then
   AC_DEFINE(HAVE_XMLRPC,1,[ ])
 
   dnl
-  dnl Default to libxml2 if --with-expat-dir is not used
+  dnl Default to libxml2 if --with-libexpat-dir is not used
   dnl
-  if test "$PHP_EXPAT_DIR" = "no"; then
+  if test "$PHP_LIBEXPAT_DIR" = "no"; then
 
     if test "$PHP_LIBXML" = "no"; then
       AC_MSG_ERROR([XML-RPC extension requires LIBXML extension, add --enable-libxml])
@@ -46,7 +46,7 @@ if test "$PHP_XMLRPC" != "no"; then
     ])
   else
     testval=no
-    for i in $PHP_EXPAT_DIR $XMLRPC_DIR /usr/local /usr; do
+    for i in $PHP_LIBEXPAT_DIR $XMLRPC_DIR /usr/local /usr; do
       if test -f $i/$PHP_LIBDIR/libexpat.a -o -f $i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME; then
         AC_DEFINE(HAVE_LIBEXPAT,1,[ ])
         PHP_ADD_LIBRARY_WITH_PATH(expat, $i/$PHP_LIBDIR, XMLRPC_SHARED_LIBADD)
@@ -57,7 +57,7 @@ if test "$PHP_XMLRPC" != "no"; then
     done
 
     if test "$testval" = "no"; then
-      AC_MSG_ERROR([XML-RPC support requires libexpat. Use --with-expat-dir=<DIR> (deprecated!)])
+      AC_MSG_ERROR([XML-RPC support requires libexpat. Use --with-libexpat-dir=<DIR> (deprecated!)])
     fi
   fi