cvs: php4 /ext/xmlrpc config.m4

yohgaki Sun Jul 28 17:03:25 2002 EDT Modified files: /php4/ext/xmlrpc config.m4 Log: Allow xmlrpc-epi header files stored under include/xmlrpc-epi Index: php4/ext/xmlrpc/config.m4 diff -u php4/ext/xmlrpc/config.m4:1.15 php4/ext/xmlrpc/config.m4:1.16 --- php4/ext/xmlrpc/config.m4:1.15 Fri Apr 5 22:50:27 2002 +++ php4/ext/xmlrpc/config.m4 Sun Jul 28 17:03:24 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.15 2002/04/06 03:50:27 andrei Exp $ +dnl $Id: config.m4,v 1.16 2002/07/28 21:03:24 yohgaki Exp $ dnl sinclude(ext/xmlrpc/libxmlrpc/acinclude.m4) @@ -58,12 +58,17 @@ elif test "$PHP_XMLRPC" != "no"; then if test -r $PHP_XMLRPC/include/xmlrpc.h; then - XMLRPC_DIR=$PHP_XMLRPC + XMLRPC_DIR=$PHP_XMLRPC/include + elif test -r $PHP_XMLRPC/include/xmlrpc-epi/xmlrpc.h; then +dnl some xmlrpc-epi header files have generic file names like +dnl queue.h or base64.h. Distributions have to create dir +dnl for xmlrpc-epi because of this. + XMLRPC_DIR=$PHP_XMLRPC/include/xmlrpc-epi else AC_MSG_CHECKING(for XMLRPC-EPI in default path) for i in /usr/local /usr; do if test -r $i/include/xmlrpc.h; then - XMLRPC_DIR=$i + XMLRPC_DIR=$i/include AC_MSG_RESULT(found in $i) fi done @@ -74,7 +79,7 @@ AC_MSG_ERROR(Please reinstall the XMLRPC-EPI distribution) fi - PHP_ADD_INCLUDE($XMLRPC_DIR/include) + PHP_ADD_INCLUDE($XMLRPC_DIR) PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib, XMLRPC_SHARED_LIBADD) fi