X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config9.m4;h=d653a7c72fa9101be03f92cfb6b48bf4147d474f;hp=998d48e0f02e9f2a78a7255a7d702c5479b7e0e8;hb=5b02bc7e61e06418cac7871485c89dcabeee42db;hpb=e44e3ceb60817cfdd17945a3f6043816e134aa75

diff --git a/config9.m4 b/config9.m4
index 998d48e..d653a7c 100644
--- a/config9.m4
+++ b/config9.m4
@@ -27,19 +27,19 @@ if test "$PHP_HTTP" != "no"; then
 
 	dnl ZLIB
 	PHP_ARG_WITH([http-zlib-dir], [whether/where to check for zlib],
-	[  --with-http-zlib-dir[=DIR]         HTTP: where to find zlib], $PHP_HTTP, no)
+	[  --with-http-zlib-dir[=DIR]         HTTP: where to find zlib], $PHP_HTTP)
 	PECL_CHECK_ZLIB([$PHP_HTTP_ZLIB_DIR], [1.2.0.4])
 	PECL_CHECK_DONE(zlib, $PECL_VAR([HAVE_ZLIB]))
-	
+
 	dnl BROTLI
 	PHP_ARG_WITH([http-libbrotli-dir], [whether/where to check for libbrotli],
-	[  --with-http-libbrotli-dir[=DIR]    HTTP: where to find libbrotli], $PHP_HTTP, no)
+	[  --with-http-libbrotli-dir[=DIR]    HTTP: where to find libbrotli], $PHP_HTTP)
 	PECL_CHECK_LIBBROTLI([$PHP_HTTP_LIBBROTLI_DIR], [1.0])
 	PECL_CHECK_DONE(libbrotli, $PECL_VAR([HAVE_LIBBROTLI]))
 
 	dnl CURL
 	PHP_ARG_WITH([http-libcurl-dir], [whether/where to check for libcurl],
-	[  --with-http-libcurl-dir[=DIR]      HTTP: where to find libcurl], $PHP_HTTP, no)
+	[  --with-http-libcurl-dir[=DIR]      HTTP: where to find libcurl], $PHP_HTTP)
 	if test "$PHP_HTTP_LIBCURL_DIR" != "no"; then
 		PECL_CHECK_LIBCURL([$PHP_HTTP_LIBCURL_DIR], [7.18.2])
 		PECL_HAVE_LIBCURL_PROTOCOL([HTTP], [
@@ -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