Skip to content

Commit e935f00

Browse files
authored
Autotools: Simplify the iconv not found error (#14931)
1 parent 0f398a4 commit e935f00

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

ext/iconv/config.m4

+2-10
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,9 @@ PHP_ARG_WITH([iconv],
55
[yes])
66

77
if test "$PHP_ICONV" != "no"; then
8+
PHP_SETUP_ICONV([ICONV_SHARED_LIBADD],,
9+
[AC_MSG_ERROR([The iconv not found. Please, check config.log for details.])])
810

9-
PHP_SETUP_ICONV(ICONV_SHARED_LIBADD, [
10-
iconv_avail="yes";
11-
],[
12-
iconv_avail="no";
13-
])
14-
15-
if test "$iconv_avail" != "no"; then
1611
save_LDFLAGS="$LDFLAGS"
1712
save_CFLAGS="$CFLAGS"
1813
LDFLAGS="$ICONV_SHARED_LIBADD $LDFLAGS"
@@ -135,7 +130,4 @@ int main(void) {
135130
PHP_NEW_EXTENSION(iconv, iconv.c, $ext_shared,, [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
136131
PHP_SUBST([ICONV_SHARED_LIBADD])
137132
PHP_INSTALL_HEADERS([ext/iconv], [php_iconv.h])
138-
else
139-
AC_MSG_ERROR(Please reinstall the iconv library.)
140-
fi
141133
fi

0 commit comments

Comments
 (0)