cvs: php4(PHP_4_2_0) /ext/xmlrpc config.m4 /ext/xslt config.m4

ssb Fri Mar 15 09:16:51 2002 EDT Modified files: (Branch: PHP_4_2_0) /php4/ext/xmlrpc config.m4 /php4/ext/xslt config.m4 Log: * MFH: "new and improved" iconv test Index: php4/ext/xmlrpc/config.m4 diff -u php4/ext/xmlrpc/config.m4:1.8.2.1 php4/ext/xmlrpc/config.m4:1.8.2.2 --- php4/ext/xmlrpc/config.m4:1.8.2.1 Wed Mar 13 04:59:52 2002 +++ php4/ext/xmlrpc/config.m4 Fri Mar 15 09:16:50 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.8.2.1 2002/03/13 09:59:52 ssb Exp $ +dnl $Id: config.m4,v 1.8.2.2 2002/03/15 14:16:50 ssb Exp $ dnl sinclude(ext/xmlrpc/libxmlrpc/acinclude.m4) @@ -33,18 +33,25 @@ 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 Index: php4/ext/xslt/config.m4 diff -u php4/ext/xslt/config.m4:1.14.2.1 php4/ext/xslt/config.m4:1.14.2.2 --- php4/ext/xslt/config.m4:1.14.2.1 Wed Mar 13 04:59:52 2002 +++ php4/ext/xslt/config.m4 Fri Mar 15 09:16:50 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.14.2.1 2002/03/13 09:59:52 ssb Exp $ +dnl $Id: config.m4,v 1.14.2.2 2002/03/15 14:16:50 ssb Exp $ dnl dnl +------------------------------------------------------------------------------+ dnl | This is where the magic of the extension reallly is. Depending on what | @@ -70,14 +70,22 @@ 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