diff options
| author | Sascha Schumann <sas@php.net> | 2002-03-20 11:59:48 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2002-03-20 11:59:48 +0000 |
| commit | 71a361d5ea2d4c6bf6d1d5b31e3fb47a8a31f7fe (patch) | |
| tree | 1efbe113730a8a46d418953f0ca32ffce94ee72b /acinclude.m4 | |
| parent | d9f36aed9fca238fde11df92eaf13dbc4462e6e7 (diff) | |
| download | php-git-71a361d5ea2d4c6bf6d1d5b31e3fb47a8a31f7fe.tar.gz | |
Fix and tweak iconv macro
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 8c45a372c0..18c24182b3 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1355,7 +1355,8 @@ dnl Common setup macro for iconv 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 @@ AC_DEFUN(PHP_SETUP_ICONV, [ 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 @@ AC_DEFUN(PHP_SETUP_ICONV, [ 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 ]) |