- Fix for bug #15227: Compiling the CGI binary with xmlrpc fails to

  build/link expat

diff --git a/ext/rpc/xmlrpc/config.m4 b/ext/rpc/xmlrpc/config.m4
index 5448c24c7eb12dbbcc8231ccb912397ba81c5a02..6462273cfe3a36b33419648320f0269e5f618a81 100644 (file)
--- a/ext/rpc/xmlrpc/config.m4
+++ b/ext/rpc/xmlrpc/config.m4
@@ -20,7 +20,7 @@ if test "$PHP_XMLRPC" != "no"; then
   AC_DEFINE(HAVE_XMLRPC,1,[ ])
 
   testval=no
-  for i in $PHP_EXPAT_DIR $XMLRPC_DIR; do
+  for i in /usr /usr/local $PHP_EXPAT_DIR $XMLRPC_DIR; do
     if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then
       AC_DEFINE(HAVE_LIBEXPAT2,1,[ ])
       PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, XMLRPC_SHARED_LIBADD)
@@ -29,6 +29,10 @@ if test "$PHP_XMLRPC" != "no"; then
     fi
   done
 
+  if test "$testval" = "no"; then
+    AC_MSG_ERROR(XML-RPC support requires libexpat. Use --with-expat-dir=<DIR>)
+  fi
+
 
 dnl  found_iconv=no
   AC_CHECK_LIB(c, iconv_open, found_iconv=yes)

diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4
index 5448c24c7eb12dbbcc8231ccb912397ba81c5a02..6462273cfe3a36b33419648320f0269e5f618a81 100644 (file)
--- a/ext/xmlrpc/config.m4
+++ b/ext/xmlrpc/config.m4
@@ -20,7 +20,7 @@ if test "$PHP_XMLRPC" != "no"; then
   AC_DEFINE(HAVE_XMLRPC,1,[ ])
 
   testval=no
-  for i in $PHP_EXPAT_DIR $XMLRPC_DIR; do
+  for i in /usr /usr/local $PHP_EXPAT_DIR $XMLRPC_DIR; do
     if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then
       AC_DEFINE(HAVE_LIBEXPAT2,1,[ ])
       PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, XMLRPC_SHARED_LIBADD)
@@ -29,6 +29,10 @@ if test "$PHP_XMLRPC" != "no"; then
     fi
   done
 
+  if test "$testval" = "no"; then
+    AC_MSG_ERROR(XML-RPC support requires libexpat. Use --with-expat-dir=<DIR>)
+  fi
+
 
 dnl  found_iconv=no
   AC_CHECK_LIB(c, iconv_open, found_iconv=yes)