diff options
| author | Jon Parise <jon@php.net> | 2002-03-20 07:36:56 +0000 |
|---|---|---|
| committer | Jon Parise <jon@php.net> | 2002-03-20 07:36:56 +0000 |
| commit | bb82bf2e2b78067d3077e372d932f18d55daae13 (patch) | |
| tree | a153bc4e7919fa42953f0caa6d92f70f90cd6b3d | |
| parent | 9ccad4a8ba9a793c1714eab22c1dd307e7eddfae (diff) | |
| download | php-git-bb82bf2e2b78067d3077e372d932f18d55daae13.tar.gz | |
This completely fixes the iconv library detection under FreeBSD (the
previous fix was incomplete). We also set HAVE_ICONV and HAVE_LIBICONV
based on the library that was detected.
| -rw-r--r-- | acinclude.m4 | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 79f6408d3b..44139d57ae 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1382,10 +1382,15 @@ AC_DEFUN(PHP_SETUP_ICONV, [ 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_ICONV, 1, [ ]) AC_DEFINE(HAVE_LIBICONV, 1, [ ]) ], [ - found_iconv=no + 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 ]) |