php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Autotools: Simplify the iconv not found error (#14931)

Browse Source
This commit is contained in:
Peter Kokot
2024-07-12 18:48:22 +02:00
committed by GitHub
parent 0f398a437e
commit e935f00fde
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ext/iconv/config.m4
View File

@@ -5,14 +5,9 @@ PHP_ARG_WITH([iconv],
[yes])
if test "$PHP_ICONV" != "no"; then
PHP_SETUP_ICONV([ICONV_SHARED_LIBADD],,
[AC_MSG_ERROR([The iconv not found. Please, check config.log for details.])])
PHP_SETUP_ICONV(ICONV_SHARED_LIBADD, [
iconv_avail="yes";
],[
iconv_avail="no";
])
if test "$iconv_avail" != "no"; then
save_LDFLAGS="$LDFLAGS"
save_CFLAGS="$CFLAGS"
LDFLAGS="$ICONV_SHARED_LIBADD $LDFLAGS"
@@ -135,7 +130,4 @@ int main(void) {
PHP_NEW_EXTENSION(iconv, iconv.c, $ext_shared,, [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
PHP_SUBST([ICONV_SHARED_LIBADD])
PHP_INSTALL_HEADERS([ext/iconv], [php_iconv.h])
else
AC_MSG_ERROR(Please reinstall the iconv library.)
fi
fi