cvs: php4 / acinclude.m4

sas Wed Mar 20 06:59:48 2002 EDT Modified files: /php4 acinclude.m4 Log: Fix and tweak iconv macro Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.169 php4/acinclude.m4:1.170 --- php4/acinclude.m4:1.169 Wed Mar 20 06:49:36 2002 +++ php4/acinclude.m4 Wed Mar 20 06:59:48 2002 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.169 2002/03/20 11:49:36 sas Exp $ +dnl $Id: acinclude.m4,v 1.170 2002/03/20 11:59:48 sas Exp $ dnl dnl This file contains local autoconf functions. @@ -1355,7 +1355,8 @@ dnl AC_DEFUN(PHP_SETUP_ICONV, [ found_iconv=no - + unset ICONV_DIR + AC_CHECK_FUNCS(iconv libiconv, [ AC_DEFINE(HAVE_ICONV, 1, [ ]) found_iconv=yes @@ -1381,15 +1382,11 @@ then PHP_CHECK_LIBRARY($iconv_lib_name, libiconv, [ found_iconv=yes - PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/lib, $1) AC_DEFINE(HAVE_LIBICONV, 1, [ ]) ], [ PHP_CHECK_LIBRARY($iconv_lib_name, iconv, [ found_iconv=yes - PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/lib, $1) AC_DEFINE(HAVE_ICONV, 1, [ ]) - ], [ - found_iconv=no ]) ], [ -L$ICONV_DIR/lib @@ -1400,7 +1397,10 @@ if test "$found_iconv" = "no"; then $3 else + if test -n "$ICONV_DIR"; then + PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/lib, $1) + PHP_ADD_INCLUDE($ICONV_DIR/include) + fi $2 - PHP_ADD_INCLUDE($ICONV_DIR/include) fi ])