diff options
| author | Yasuo Ohgaki <yohgaki@php.net> | 2002-07-28 21:03:26 +0000 |
|---|---|---|
| committer | Yasuo Ohgaki <yohgaki@php.net> | 2002-07-28 21:03:26 +0000 |
| commit | 073c21e5c0b92b0b43059ac1f5b2618a61a9acde (patch) | |
| tree | fc8ecba23589bc38a4193b81b0c99cf1475f8e14 | |
| parent | 1630e1788f19c46b68b41cae0881076c6868bd10 (diff) | |
| download | php-git-073c21e5c0b92b0b43059ac1f5b2618a61a9acde.tar.gz | |
Allow xmlrpc-epi header files stored under include/xmlrpc-epi
| -rw-r--r-- | ext/rpc/xmlrpc/config.m4 | 11 | ||||
| -rw-r--r-- | ext/xmlrpc/config.m4 | 11 |
2 files changed, 16 insertions, 6 deletions
diff --git a/ext/rpc/xmlrpc/config.m4 b/ext/rpc/xmlrpc/config.m4 index 5da82a76be..b0cf506039 100644 --- a/ext/rpc/xmlrpc/config.m4 +++ b/ext/rpc/xmlrpc/config.m4 @@ -58,12 +58,17 @@ if test "$PHP_XMLRPC" = "yes"; then 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 @@ elif test "$PHP_XMLRPC" != "no"; then 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 diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4 index 5da82a76be..b0cf506039 100644 --- a/ext/xmlrpc/config.m4 +++ b/ext/xmlrpc/config.m4 @@ -58,12 +58,17 @@ if test "$PHP_XMLRPC" = "yes"; then 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 @@ elif test "$PHP_XMLRPC" != "no"; then 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 |