mirror of
https://github.com/php/php-src.git
synced 2026-03-27 17:52:16 +01:00
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.
This commit is contained in:
@@ -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
|
||||
])
|
||||
|
||||
Reference in New Issue
Block a user