diff options
| -rw-r--r-- | ext/iconv/config.m4 | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4 index a6ffe827af..f37e7f1e50 100644 --- a/ext/iconv/config.m4 +++ b/ext/iconv/config.m4 @@ -43,24 +43,26 @@ int main() { icv_close( cd ); return 2; } -],[ - AC_MSG_RESULT(yes) - PHP_DEFINE([ICONV_SUPPORTS_ERRNO],1) - AC_DEFINE([ICONV_SUPPORTS_ERRNO],1,[Whether iconv supports error no or not]) -],[ - PHP_DEFINE([ICONV_SUPPORTS_ERRNO],0) - AC_DEFINE([ICONV_SUPPORTS_ERRNO],0,[Whether iconv supports error no or not]) - AC_MSG_RESULT(no) -]) - if test -z "$iconv_lib_name"; then - AC_MSG_CHECKING([if iconv is glibc's]) - AC_TRY_COMPILE([#include <iconv.h>],[void __gconv(); int main() { __gconv(); } ],[ + ],[ AC_MSG_RESULT(yes) - PHP_DEFINE([ICONV_IMPL],["glibc"]) - AC_DEFINE([ICONV_IMPL],["glibc"],[Which iconv implementation to use]) -],[ + PHP_DEFINE([ICONV_SUPPORTS_ERRNO],1) + AC_DEFINE([ICONV_SUPPORTS_ERRNO],1,[Whether iconv supports error no or not]) + ],[ AC_MSG_RESULT(no) -]) + PHP_DEFINE([ICONV_SUPPORTS_ERRNO],0) + AC_DEFINE([ICONV_SUPPORTS_ERRNO],0,[Whether iconv supports error no or not]) + ]) + + if test -z "$iconv_lib_name"; then + AC_MSG_CHECKING([if iconv is glibc's]) + AC_TRY_COMPILE([#include <iconv.h>],[void __gconv(); int main() { __gconv(); }], + [ + AC_MSG_RESULT(yes) + PHP_DEFINE([ICONV_IMPL],["glibc"]) + AC_DEFINE([ICONV_IMPL],["glibc"],[Which iconv implementation to use]) + ],[ + AC_MSG_RESULT(no) + ]) else case "$iconv_lib_name" in iconv [)] |