cvs: php4(PHP_4_2_0) /ext/xmlrpc config.m4
| From: | Yasuo Ohgaki | Date: | Sun, 28 Jul 2002 21:03:49 +0000 |
| Subject: | cvs: php4(PHP_4_2_0) /ext/xmlrpc config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13025@lists.php.net to get a copy of this message | ||
yohgaki Sun Jul 28 17:03:49 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/php4/ext/xmlrpc config.m4
Log:
FHM
Index: php4/ext/xmlrpc/config.m4
diff -u php4/ext/xmlrpc/config.m4:1.8.2.4 php4/ext/xmlrpc/config.m4:1.8.2.5
--- php4/ext/xmlrpc/config.m4:1.8.2.4 Mon Mar 25 19:15:29 2002
+++ php4/ext/xmlrpc/config.m4 Sun Jul 28 17:03:49 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.8.2.4 2002/03/26 00:15:29 sniper Exp $
+dnl $Id: config.m4,v 1.8.2.5 2002/07/28 21:03:49 yohgaki Exp $
dnl
sinclude(ext/xmlrpc/libxmlrpc/acinclude.m4)
@@ -56,12 +56,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
@@ -72,7 +77,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