diff options
author | foobar <sniper@php.net> | 2002-03-17 21:09:21 +0000 |
---|---|---|
committer | foobar <sniper@php.net> | 2002-03-17 21:09:21 +0000 |
commit | 19e82a49f96393a7ae93331db73ef895f3c61376 (patch) | |
tree | a7d616a261888c324c13fd33788dca8ca3c7fb05 /ext/xmlrpc | |
parent | 0d3a45299da1a36dd54680221494917e7ae65597 (diff) | |
download | php-git-19e82a49f96393a7ae93331db73ef895f3c61376.tar.gz |
- Made one test/setup macro for iconv and fixed it to check
for libc first.
Diffstat (limited to 'ext/xmlrpc')
-rw-r--r-- | ext/xmlrpc/config.m4 | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4 index 69eb0b4232..a7f4fae3b8 100644 --- a/ext/xmlrpc/config.m4 +++ b/ext/xmlrpc/config.m4 @@ -32,29 +32,9 @@ if test "$PHP_XMLRPC" != "no"; then AC_MSG_ERROR(XML-RPC support requires libexpat. Use --with-expat-dir=<DIR>) fi - found_iconv=no - - if test -z "$ICONV_DIR"; then - AC_MSG_ERROR(Please specify the location of iconv with --with-iconv) - fi - - if test -f $ICONV_DIR/lib/lib${iconv_lib_name}.a || - test -f $ICONV_DIR/lib/lib${iconv_lib_name}.$SHLIB_SUFFIX_NAME - then - PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/lib, XMLRPC_SHARED_LIBADD) - AC_CHECK_LIB($iconv_lib_name, libiconv_open, [ - found_iconv=yes - ]) - else - AC_CHECK_LIB(c, iconv_open, [ - found_iconv=yes - ]) - fi - - if test "$found_iconv" = "no"; then + PHP_SETUP_ICONV(XMLRPC_SHARED_LIBADD, [], [ AC_MSG_ERROR([iconv not found, in order to build xmlrpc you need the iconv library]) - fi - + ]) fi |