X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=config9.m4;h=4f6d589f6078697267caa69d58c12dd651dbcfb4;hb=3a4f177092dec08373761f535e47bdd7a371d52a;hp=897b92ff94ef016e551a45fe8dabe1e2ec283500;hpb=6c1356cbe7363bf41f770b1dce59abef93dcc021;p=m6w6%2Fext-http diff --git a/config9.m4 b/config9.m4 index 897b92f..4f6d589 100644 --- a/config9.m4 +++ b/config9.m4 @@ -87,7 +87,11 @@ if test "$PHP_HTTP" != "no"; then if test "$PHP_HTTP_LIBICU_DIR" != "no"; then AC_PATH_PROG(ICU_CONFIG, icu-config, false, [$PHP_HTTP_LIBICU_DIR/bin:$PATH:/usr/local/bin]) - PECL_CHECK_CONFIG(libicu, [$ICU_CONFIG], [--version], [--cppflags], [--ldflags-searchpath], [--ldflags-libsonly]) + if $ICU_CONFIG --exists >/dev/null 2>/dev/null; then + PECL_CHECK_CONFIG(libicu, [$ICU_CONFIG], [--version], [--cppflags], [--ldflags-searchpath], [--ldflags-libsonly]) + else + PECL_CHECK_PKGCONFIG(icu-i18n, [$PHP_HTTP_LIBICU_DIR]) + fi AC_CACHE_CHECK([for uidna_IDNToASCII], PECL_CACHE_VAR([HAVE_UIDNA_IDNToASCII]), [ if printf "%s" "$CFLAGS" | $EGREP -q "(^|\s)-Werror\b"; then if ! printf "%s" "$CFLAGS" | $EGREP -q "(^|\s)-Wno-error=deprecated-declarations\b"; then