cvs: php-src /ext/xmlrpc config.m4

sniper Sat Aug 27 20:43:31 2005 EDT Modified files: /php-src/ext/xmlrpc config.m4 Log: - Fixed bug #34221 (Compiling xmlrpc as shared fails other parts) http://cvs.php.net/diff.php/php-src/ext/xmlrpc/config.m4?r1=1.25&r2=1.26&ty=u Index: php-src/ext/xmlrpc/config.m4 diff -u php-src/ext/xmlrpc/config.m4:1.25 php-src/ext/xmlrpc/config.m4:1.26 --- php-src/ext/xmlrpc/config.m4:1.25 Sun May 29 19:16:45 2005 +++ php-src/ext/xmlrpc/config.m4 Sat Aug 27 20:43:29 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.25 2005/05/29 23:16:45 sniper Exp $ +dnl $Id: config.m4,v 1.26 2005/08/28 00:43:29 sniper Exp $ dnl sinclude(ext/xmlrpc/libxmlrpc/acinclude.m4) @@ -15,8 +15,8 @@ [ --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 @@ 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 @@ ]) 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 @@ 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