diff options
| author | Stig Bakken <ssb@php.net> | 2002-03-15 13:56:32 +0000 |
|---|---|---|
| committer | Stig Bakken <ssb@php.net> | 2002-03-15 13:56:32 +0000 |
| commit | fb624cb77a67c951f11302638e0776cfacb095fb (patch) | |
| tree | 187f2cbe8300f0ddd689ea940352d07e9a9c99c0 | |
| parent | 720c40dd4e7ce4b2aa9c84a327b29c0ab23c7be9 (diff) | |
| download | php-git-fb624cb77a67c951f11302638e0776cfacb095fb.tar.gz | |
* "new and improved" iconv test
| -rw-r--r-- | ext/rpc/xmlrpc/config.m4 | 27 | ||||
| -rw-r--r-- | ext/xmlrpc/config.m4 | 27 | ||||
| -rw-r--r-- | ext/xslt/config.m4 | 24 |
3 files changed, 50 insertions, 28 deletions
diff --git a/ext/rpc/xmlrpc/config.m4 b/ext/rpc/xmlrpc/config.m4 index 57ec0fc74c..69eb0b4232 100644 --- a/ext/rpc/xmlrpc/config.m4 +++ b/ext/rpc/xmlrpc/config.m4 @@ -32,18 +32,25 @@ if test "$PHP_XMLRPC" != "no"; then AC_MSG_ERROR(XML-RPC support requires libexpat. Use --with-expat-dir=<DIR>) fi + found_iconv=no -dnl found_iconv=no - AC_CHECK_LIB(c, iconv_open, found_iconv=yes) - if test "$found_iconv" = "no"; then - for i in /usr /usr/local $ICONV_DIR; do - if test -f $i/lib/libiconv.a -o -f $i/lib/libiconv.$SHLIB_SUFFIX_NAME; then - PHP_ADD_LIBRARY_WITH_PATH(iconv, $i/lib, XMLRPC_SHARED_LIBADD) - found_iconv=yes - fi - done + 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 AC_MSG_ERROR([iconv not found, in order to build xmlrpc you need the iconv library]) fi diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4 index 57ec0fc74c..69eb0b4232 100644 --- a/ext/xmlrpc/config.m4 +++ b/ext/xmlrpc/config.m4 @@ -32,18 +32,25 @@ if test "$PHP_XMLRPC" != "no"; then AC_MSG_ERROR(XML-RPC support requires libexpat. Use --with-expat-dir=<DIR>) fi + found_iconv=no -dnl found_iconv=no - AC_CHECK_LIB(c, iconv_open, found_iconv=yes) - if test "$found_iconv" = "no"; then - for i in /usr /usr/local $ICONV_DIR; do - if test -f $i/lib/libiconv.a -o -f $i/lib/libiconv.$SHLIB_SUFFIX_NAME; then - PHP_ADD_LIBRARY_WITH_PATH(iconv, $i/lib, XMLRPC_SHARED_LIBADD) - found_iconv=yes - fi - done + 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 AC_MSG_ERROR([iconv not found, in order to build xmlrpc you need the iconv library]) fi diff --git a/ext/xslt/config.m4 b/ext/xslt/config.m4 index ffb869e1a2..f8fdacfebb 100644 --- a/ext/xslt/config.m4 +++ b/ext/xslt/config.m4 @@ -70,14 +70,22 @@ if test "$PHP_XSLT" != "no"; then fi found_iconv=no - AC_CHECK_LIB(c, iconv_open, found_iconv=yes) - if test "$found_iconv" = "no"; then - for i in /usr /usr/local $ICONV_DIR; do - if test -f $i/lib/libiconv.a -o -f $i/lib/libiconv.so; then - PHP_ADD_LIBRARY_WITH_PATH(iconv, $i/lib, XSLT_SHARED_LIBADD) - found_iconv=yes - fi - done + + 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, XSLT_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 |