cvs: php4 /ext/sablot config.m4 /ext/xslt config.m4

sniper Fri Aug 17 04:33:49 2001 EDT Modified files: /php4/ext/xslt config.m4 /php4/ext/sablot config.m4 Log: Look for iconv library also in $ICONV_DIR. Index: php4/ext/xslt/config.m4 diff -u php4/ext/xslt/config.m4:1.8 php4/ext/xslt/config.m4:1.9 --- php4/ext/xslt/config.m4:1.8 Thu Aug 2 07:19:18 2001 +++ php4/ext/xslt/config.m4 Fri Aug 17 04:33:48 2001 @@ -3,7 +3,7 @@ dnl | This is where the magic of the extension reallly is. Depending on what | dnl | backend the user chooses, this script performs the magic | dnl +------------------------------------------------------------------------------+ -dnl $Id: config.m4,v 1.8 2001/08/02 11:19:18 thies Exp $ +dnl $Id: config.m4,v 1.9 2001/08/17 08:33:48 sniper Exp $ PHP_ARG_ENABLE(xslt, whether to enable xslt support, [ --enable-xslt Enable xslt support]) @@ -68,14 +68,12 @@ found_iconv=no AC_CHECK_LIB(c, iconv_open, found_iconv=yes) if test "$found_iconv" = "no"; then - if test "$PHP_ICONV" = "no"; then - for i in /usr /usr/local; do + for i in /usr /usr/local $ICONV_DIR; do if test -f $i/lib/libconv.a -o -f $i/lib/libiconv.so; then - PHP_ADD_LIBRARY_WITH_PATH(iconv, $i/lib) + PHP_ADD_LIBRARY_WITH_PATH(iconv, $i/lib, XSLT_SHARED_LIBADD) found_iconv=yes fi done - fi fi if test "$found_iconv" = "no"; then Index: php4/ext/sablot/config.m4 diff -u php4/ext/sablot/config.m4:1.20 php4/ext/sablot/config.m4:1.21 --- php4/ext/sablot/config.m4:1.20 Fri Aug 10 05:05:37 2001 +++ php4/ext/sablot/config.m4 Fri Aug 17 04:33:48 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.20 2001/08/10 09:05:37 rasmus Exp $ +dnl $Id: config.m4,v 1.21 2001/08/17 08:33:48 sniper Exp $ dnl config.m4 for extension Sablot PHP_ARG_WITH(sablot, for Sablotron XSL support, @@ -52,14 +52,12 @@ found_iconv=no AC_CHECK_LIB(c, iconv_open, found_iconv=yes) if test "$found_iconv" = "no"; then - if test "$PHP_ICONV" = "no"; then - for i in /usr /usr/local; do + for i in /usr /usr/local $ICONV_DIR; do if test -f $i/lib/libconv.a -o -f $i/lib/libiconv.s?; then - PHP_ADD_LIBRARY_WITH_PATH(iconv, $i/lib) + PHP_ADD_LIBRARY_WITH_PATH(iconv, $i/lib, SABLOT_SHARED_LIBADD) found_iconv=yes fi done - fi fi if test "$found_iconv" = "no"; then