X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config9.m4;h=897b92ff94ef016e551a45fe8dabe1e2ec283500;hp=20e7d6c9317dac3d9417ec31a678ea9df9aac068;hb=567a61130ed7f4fd7b47fe104ec32990f84bc06e;hpb=19b186b70c9fa66bd6086d719d710a0994c3f63a

diff --git a/config9.m4 b/config9.m4
index 20e7d6c..897b92f 100644
--- a/config9.m4
+++ b/config9.m4
@@ -1,609 +1,210 @@
-dnl config.m4 for pecl/http
-dnl $Id: config9.m4 242664 2007-09-18 19:13:37Z mike $
-dnl vim: noet ts=4 sw=4
+
+m4_foreach(dir, [., ext/http], [
+	sinclude(dir/autoconf/pecl/pecl.m4)
+	sinclude(dir/autoconf/pecl/zlib.m4)
+	sinclude(dir/autoconf/pecl/libbrotli.m4)
+	sinclude(dir/autoconf/pecl/libcurl.m4)
+	sinclude(dir/autoconf/pecl/libevent.m4)
+])
+
+PECL_INIT([http])
 
 PHP_ARG_WITH([http], [whether to enable extended HTTP support],
 [  --with-http             Enable extended HTTP support])
-PHP_ARG_WITH([http-zlib-dir], [],
-[  --with-http-zlib-dir[=DIR]     HTTP: where to find zlib], $PHP_HTTP, $PHP_HTTP)
-PHP_ARG_WITH([http-libcurl-dir], [],
-[  --with-http-libcurl-dir[=DIR]  HTTP: where to find libcurl], $PHP_HTTP, $PHP_HTTP)
-PHP_ARG_WITH([http-libevent-dir], [],
-[  --with-http-libevent-dir[=DIR] HTTP: where to find libevent], $PHP_HTTP_LIBCURL_DIR, "")
-PHP_ARG_WITH([http-libidn-dir], [],
-[  --with-http-libidn-dir=[=DIR]  HTTP: where to find libidn], $PHP_HTTP_LIBCURL_DIR, "")
-
 if test "$PHP_HTTP" != "no"; then
-
-	HTTP_HAVE_A_REQUEST_LIB=false
-
-	ifdef([AC_PROG_EGREP], [
-		AC_PROG_EGREP
-	], [
-		AC_CHECK_PROG(EGREP, egrep, egrep)
-	])
-	ifdef([AC_PROG_SED], [
-		AC_PROG_SED
-	], [
-		ifdef([LT_AC_PROG_SED], [
-			LT_AC_PROG_SED
-		], [
-			AC_CHECK_PROG(SED, sed, sed)
-		])
-	])
-	
-	AC_PROG_CPP
-	
-	if test "$PHP_HTTP_SHARED_DEPS" != "no"; then
-		AC_DEFINE([PHP_HTTP_SHARED_DEPS], [1], [ ])
-	else
-		AC_DEFINE([PHP_HTTP_SHARED_DEPS], [0], [ ])
-	fi
-	
-	dnl
-	dnl HTTP_SHARED_DEP(name[, code-if-yes[, code-if-not]])
-	dnl
-	AC_DEFUN([HTTP_SHARED_DEP], [
-		extname=$1
-		haveext=$[PHP_HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)
-		
-		AC_MSG_CHECKING([whether to add a dependency on ext/$extname])
-		if test "$PHP_HTTP_SHARED_DEPS" = "no"; then
-			AC_MSG_RESULT([no])
-			$3
-		elif test "$haveext"; then
-			AC_MSG_RESULT([yes])
-			AC_DEFINE([PHP_HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__), [1], [ ])
-			ifdef([PHP_ADD_EXTENSION_DEP], [
-				PHP_ADD_EXTENSION_DEP([http], $1, true)
-			])
-			$2
-		else
-			AC_MSG_RESULT([no])
-			$3
-		fi
-	])
-	
-	dnl
-	dnl HTTP_HAVE_PHP_EXT(name[, code-if-yes[, code-if-not]])
-	dnl
-	AC_DEFUN([HTTP_HAVE_PHP_EXT], [
-		extname=$1
-		haveext=$[PHP_]translit($1,a-z_-,A-Z__)
-		AC_MSG_CHECKING([for ext/$extname support])
-		if test -x "$PHP_EXECUTABLE"; then
-			grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$`
-			if test "$grepext" = "$extname"; then
-				[PHP_HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)=1
-				AC_MSG_RESULT([yes])
-				$2
-			else
-				[PHP_HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)=
-				AC_MSG_RESULT([no])
-				$3
-			fi
-		elif test "$haveext" != "no" && test "x$haveext" != "x"; then
-			[PHP_HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)=1
-			AC_MSG_RESULT([yes])
-			$2
-		else
-			[PHP_HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)=
-			AC_MSG_RESULT([no])
-			$3
-		fi
-	])
-	
-
-dnl ----
-dnl STDC
-dnl ----
+	dnl STDC
 	AC_TYPE_OFF_T
 	AC_TYPE_MBSTATE_T
 	dnl getdomainname() is declared in netdb.h on some platforms: AIX, OSF
 	AC_CHECK_HEADERS([netdb.h unistd.h wchar.h wctype.h arpa/inet.h])
-	PHP_CHECK_FUNC(gethostname, nsl)
-	PHP_CHECK_FUNC(getdomainname, nsl)
-	PHP_CHECK_FUNC(mbrtowc)
-	PHP_CHECK_FUNC(mbtowc)
-	PHP_CHECK_FUNC(iswalnum)
-	PHP_CHECK_FUNC(inet_pton)
+	AC_CHECK_FUNC(gethostname,,[
+		AC_CHECK_LIB(nsl, gethostname)
+	])
+	AC_CHECK_FUNC(getdomainname,,[
+		AC_CHECK_LIB(nsl, getdomainname)
+	])
+	AC_CHECK_FUNCS(mbrtowc mbtowc iswalnum inet_pton)
 
-dnl ----
-dnl IDN
-dnl ----
+	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)
+	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)
+	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)
+	if test "$PHP_HTTP_LIBCURL_DIR" != "no"; then
+		PECL_CHECK_LIBCURL([$PHP_HTTP_LIBCURL_DIR], [7.18.2])
+		PECL_HAVE_LIBCURL_PROTOCOL([HTTP], [
+			PECL_HAVE_LIBCURL_FEATURE([HTTP2])
+			PECL_HAVE_LIBCURL_ARES
+			PECL_HAVE_LIBCURL_SSL
+			PECL_HAVE_LIBCURL_CA
+			PECL_DEFINE([HAVE_CLIENT])
+		])
+		PECL_CHECK_DONE(libcurl, [$PECL_VAR([HAVE_LIBCURL_PROTOCOL_HTTP])])
+	fi
 
-	AC_MSG_CHECKING([for idna.h])
-	IDNA_DIR=
-	for i in "$PHP_HTTP_LIBIDN_DIR" "$IDN_DIR" /usr/local /usr /opt; do
-		if test -f "$i/include/idna.h"; then
-			IDNA_DIR=$i
-			break;
-		fi
-	done
-	if test "x$IDNA_DIR" = "x"; then
-		AC_MSG_RESULT([not found])
-	else
-		AC_MSG_RESULT([found in $IDNA_DIR])
-		AC_DEFINE([PHP_HTTP_HAVE_IDN], [1], [Have libidn support])
-		PHP_ADD_INCLUDE($IDNA_DIR/include)
-		PHP_ADD_LIBRARY_WITH_PATH(idn, $IDNA_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
+	dnl EVENT
+	PHP_ARG_WITH([http-libevent-dir], [whether/where to check for libevent],
+	[  --with-http-libevent-dir[=DIR]     HTTP: where to find libevent], $PHP_HTTP_LIBCURL_DIR, no)
+	if test "$PHP_HTTP_LIBEVENT_DIR" != "no"; then
+		PECL_CHECK_LIBEVENT([$PHP_HTTP_LIBEVENT_DIR])
+		PECL_CHECK_DONE(libevent, [$PECL_VAR([HAVE_LIBEVENT])])
 	fi
 
-dnl ----
-dnl ZLIB
-dnl ----
-	AC_MSG_CHECKING([for zlib.h])
-	ZLIB_DIR=
-	for i in "$PHP_HTTP_ZLIB_DIR" "$PHP_ZLIB_DIR" "$PHP_ZLIB" /usr/local /usr /opt; do
-		if test -f "$i/include/zlib.h"; then
-			ZLIB_DIR=$i
-			break;
+	dnl GNU IDNA
+	PHP_ARG_WITH([http-libidn2-dir], [whether/where to check for libidn2],
+	[  --with-http-libidn2-dir[=DIR]      HTTP: where to find libidn2], $PHP_HTTP_LIBCURL_DIR, no)
+	if test "$PHP_HTTP_LIBIDN2_DIR" != "no"; then
+		PECL_CHECK_CUSTOM(libidn2, "$PHP_HTTP_LIBIDN2_DIR", idn2.h, idn2,
+			[$($EGREP "define IDN2_VERSION " "include/idn2.h" | $SED -e's/^.*VERSION //g' -e 's/@<:@^0-9\.@:>@//g')])
+		if $PECL_VAR([HAVE_LIBIDN2]); then
+			PECL_DEFINE([HAVE_IDNA2008])
 		fi
-	done
-	if test "x$ZLIB_DIR" = "x"; then
-		AC_MSG_RESULT([not found])
-		AC_MSG_ERROR([could not find zlib.h])
-	else
-		AC_MSG_RESULT([found in $ZLIB_DIR])
-		AC_MSG_CHECKING([for zlib version >= 1.2.0.4])
-		ZLIB_VERSION=`$EGREP "define ZLIB_VERSION" $ZLIB_DIR/include/zlib.h | $SED -e 's/[[^0-9\.]]//g'`
-		AC_MSG_RESULT([$ZLIB_VERSION])
-		if test `echo $ZLIB_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*1000000 + $2*10000 + $3*100 + $4}'` -lt 1020004; then
-			AC_MSG_ERROR([zlib version greater or equal to 1.2.0.4 required])
-		else
-			PHP_ADD_INCLUDE($ZLIB_DIR/include)
-			PHP_ADD_LIBRARY_WITH_PATH(z, $ZLIB_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
+		PECL_CHECK_DONE(libidn2, $PECL_VAR([HAVE_LIBIDN2]))
+	fi
+	PHP_ARG_WITH([http-libidn-dir], [whether/where to check for libidn],
+	[  --with-http-libidn-dir[=DIR]       HTTP: where to find libidn], $PHP_HTTP_LIBCURL_DIR, no)
+	if test "$PHP_HTTP_LIBIDN_DIR" != "no"; then
+		PECL_CHECK_PKGCONFIG(libidn, [$PHP_HTTP_LIBIDN_DIR])
+		if $PECL_VAR([HAVE_LIBIDN]); then
+			PECL_DEFINE([HAVE_IDNA2003])
 		fi
+		PECL_CHECK_DONE(libidn, $PECL_VAR([HAVE_LIBIDN]))
 	fi
-	
-dnl ----
-dnl CURL
-dnl ----
 
-	if test "$PHP_HTTP_LIBCURL_DIR" = "no"; then
-		AC_DEFINE([PHP_HTTP_HAVE_CURL], [0], [ ])
-	else
-		AC_MSG_CHECKING([for curl/curl.h])
-		CURL_DIR=
-		for i in "$PHP_HTTP_LIBCURL_DIR" /usr/local /usr /opt; do
-			if test -f "$i/include/curl/curl.h"; then
-				CURL_DIR=$i
-				break
-			fi
-		done
-		if test "x$CURL_DIR" = "x"; then
-			AC_MSG_RESULT([not found])
-		else
-			AC_MSG_RESULT([found in $CURL_DIR])
-		
-			AC_MSG_CHECKING([for curl-config])
-			CURL_CONFIG=
-			for i in "$CURL_DIR/bin/curl-config" "$CURL_DIR/curl-config" `which curl-config`; do
-				if test -x "$i"; then
-					CURL_CONFIG=$i
-					break
+	dnl ICU IDNA
+	PHP_ARG_WITH([http-libicu-dir], [whether/where to check for libicu],
+	[  --with-http-libicu-dir[=DIR]       HTTP: where to find libicu], $PHP_HTTP_LIBCURL_DIR, no)
+	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])
+		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
+					CFLAGS="$CFLAGS -Wno-error=deprecated-declarations"
 				fi
-			done
-			if test "x$CURL_CONFIG" = "x"; then
-				AC_MSG_RESULT([not found])
-				AC_MSG_ERROR([could not find curl-config])
-			else
-				AC_MSG_RESULT([found: $CURL_CONFIG])
-			fi
-		
-			dnl RHEL6:         7.19.7
-			dnl SUSE11:        7.19.7
-			dnl Debian wheezy: 7.26.0
-			dnl Debian sqeeze: 7.21.0
-			dnl Debian ancient 7.18.2
-			AC_MSG_CHECKING([for curl version >= 7.18.2])
-			CURL_VERSION=`$CURL_CONFIG --version | $SED -e 's/[[^0-9\.]]//g'`
-			AC_MSG_RESULT([$CURL_VERSION])
-			if test `echo $CURL_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71802; then
-				AC_MSG_ERROR([libcurl version greater or equal to 7.18.2 required])
-			fi
-			
-			AC_MSG_CHECKING([for HTTP2 support in libcurl])
-			if $CURL_CONFIG --features | $EGREP -q HTTP2; then
-				AC_MSG_RESULT([yes])
-				AC_DEFINE([PHP_HTTP_HAVE_HTTP2], [1], [ ])
-			else
-				AC_MSG_RESULT([no])
 			fi
-		
-			dnl
-			dnl compile tests
-			dnl
-		
-			save_INCLUDES="$INCLUDES"
-			INCLUDES=
-			save_LIBS="$LIBS"
-			LIBS=-lcurl
-			save_CFLAGS="$CFLAGS"
-			CFLAGS="$CFLAGS `$CURL_CONFIG --cflags`"
-			save_LDFLAGS="$LDFLAGS"
-			LDFLAGS="$ld_runpath_switch$CURL_DIR/$PHP_LIBDIR"
-		
-			AC_MSG_CHECKING([for SSL support in libcurl])
-			CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
-			CURL_SSL_LIBS=""
-			if test "$CURL_SSL" = "SSL"; then
-				AC_MSG_RESULT([yes])
-				AC_DEFINE([PHP_HTTP_HAVE_SSL], [1], [ ])
-			
-				AC_MSG_CHECKING([for openssl support in libcurl])
-				AC_TRY_RUN([
-					#include <curl/curl.h>
-					int main(int argc, char *argv[]) {
-						curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
-						if (data && data->ssl_version && *data->ssl_version) {
-							const char *ptr = data->ssl_version;
-							while(*ptr == ' ') ++ptr;
-							return strncasecmp(ptr, "OpenSSL", sizeof("OpenSSL")-1);
-						}
-						return 1;
-					}
-				], [
-					AC_MSG_RESULT([yes])
-					AC_CHECK_HEADER([openssl/ssl.h], [
-						AC_CHECK_HEADER([openssl/crypto.h], [
-							AC_DEFINE([PHP_HTTP_HAVE_OPENSSL], [1], [ ])
-							CURL_SSL_LIBS="ssl crypto"
-						])
-					])
-				], [
-					AC_MSG_RESULT([no])
-				], [
-					AC_MSG_RESULT([no])
-				])
-			
-				AC_MSG_CHECKING([for gnutls support in libcurl])
-				AC_TRY_RUN([
-					#include <curl/curl.h>
-					int main(int argc, char *argv[]) {
-						curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
-						if (data && data->ssl_version && *data->ssl_version) {
-							const char *ptr = data->ssl_version;
-							while(*ptr == ' ') ++ptr;
-							return strncasecmp(ptr, "GnuTLS", sizeof("GnuTLS")-1);
-						}
-						return 1;
-					}
-				], [
-					AC_MSG_RESULT([yes])
-					AC_CHECK_HEADER([gnutls.h], [
-						AC_CHECK_HEADER([gcrypt.h], [
-							AC_DEFINE([PHP_HTTP_HAVE_GNUTLS], [1], [ ])
-							CURL_SSL_LIBS="gnutls gcrypt"
-						])
-					])
-				], [
-					AC_MSG_RESULT([no])
-				], [
-					AC_MSG_RESULT([no])
-				])
-			else
-				AC_MSG_RESULT([no])
-			fi
-			
-			AC_MSG_CHECKING([for ares support in libcurl])
-			AC_TRY_RUN([
-				#include <curl/curl.h>
-				int main(int argc, char *argv[]) {
-					curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
-					if (data && data->ares && data->ares_num0) {
-						return 0;
-					}
-					return 1;
-				}
+			AC_TRY_LINK([
+				#include <unicode/uidna.h>
 			], [
-				AC_MSG_RESULT([yes])
-				AC_DEFINE([PHP_HTTP_HAVE_ARES], [1], [ ])
+				uidna_IDNToASCII(0, 0, 0, 0, 0, 0, 0);
 			], [
-				AC_MSG_RESULT([no])
+				PECL_CACHE_VAR([HAVE_UIDNA_IDNToASCII])=yes
 			], [
-				AC_MSG_RESULT([no])
+				PECL_CACHE_VAR([HAVE_UIDNA_IDNToASCII])=no
 			])
-			
-			AC_MSG_CHECKING([whether CURLOPT_TLSAUTH_TYPE expects CURL_TLSAUTH_SRP or literal "SRP"])
-			AC_TRY_RUN([
-				#include <curl/curl.h>
-				int main(int argc, char *argv[]) {
-					CURL *ch = curl_easy_init();
-					return curl_easy_setopt(ch, CURLOPT_TLSAUTH_TYPE, CURL_TLSAUTH_SRP);
-				}
+		])
+		if $PECL_CACHE_VAR([HAVE_UIDNA_IDNTOASCII]); then
+			PECL_DEFINE([HAVE_IDNA2003])
+			PECL_DEFINE_FN([UIDNA_IDNTOASCII])
+		fi
+
+		AC_CACHE_CHECK([for uidna_nameToASCII_UTF8], PECL_CACHE_VAR([HAVE_UIDNA_NAMETOASCII_UTF8]), [
+			AC_TRY_LINK([
+				#include <unicode/uidna.h>
 			], [
-				AC_MSG_RESULT([CURL_TLSAUTH_SRP])
-				AC_DEFINE([PHP_HTTP_CURL_TLSAUTH_SRP], [CURL_TLSAUTH_SRP], [ ])
-				AC_DEFINE([PHP_HTTP_CURL_TLSAUTH_DEF], [CURL_TLSAUTH_NONE], [ ])
+				uidna_nameToASCII_UTF8(0, 0, 0, 0, 0, 0, 0);
 			], [
-				AC_TRY_RUN([
-					#include <curl/curl.h>
-					int main(int argc, char *argv[]) {
-						CURL *ch = curl_easy_init();
-						return curl_easy_setopt(ch, CURLOPT_TLSAUTH_TYPE, "SRP");
-					}
-				], [
-					AC_MSG_RESULT(["SRP"])
-					AC_DEFINE([PHP_HTTP_CURL_TLSAUTH_SRP], ["SRP"], [ ])
-					AC_DEFINE([PHP_HTTP_CURL_TLSAUTH_DEF], [""], [ ])
-				], [
-					AC_MSG_RESULT([neither])
-				], [
-					AC_MSG_RESULT([neither])
-				])			
+				PECL_CACHE_VAR([HAVE_UIDNA_NAMETOASCII_UTF8])=yes
 			], [
-				AC_MSG_RESULT([neither])
+				PECL_CACHE_VAR([HAVE_UIDNA_NAMETOASCII_UTF8])=no
 			])
-		
-			INCLUDES="$save_INCLUDES"
-			LIBS="$save_LIBS"
-			CFLAGS="$save_CFLAGS"
-			LDFLAGS="$save_LDFLAGS"
-			
-			if test -n "$CURL_SSL_LIBS"; then
-				for CURL_SSL_LIB in $CURL_SSL_LIBS; do
-					PHP_ADD_LIBRARY_WITH_PATH([$CURL_SSL_LIB], $CURL_DIR/$PHP_LIBDIR, PHP_HTTP_SHARED_LIBADD)
-				done
-			fi
-			
-			dnl end compile tests
-		
-			AC_MSG_CHECKING([for bundled SSL CA info])
-			CURL_CAINFO=
-			for i in `$CURL_CONFIG --ca` "/etc/ssl/certs/ca-certificates.crt" "/etc/ssl/certs/ca-bundle.crt"; do
-				if test -f "$i"; then
-					CURL_CAINFO="$i"
-					break
-				fi
-			done
-			if test "x$CURL_CAINFO" = "x"; then
-				AC_MSG_RESULT([not found])
-			else
-				AC_MSG_RESULT([$CURL_CAINFO])
-				AC_DEFINE_UNQUOTED([PHP_HTTP_CURL_CAINFO], ["$CURL_CAINFO"], [path to bundled SSL CA info])
-			fi
-		
-			PHP_ADD_INCLUDE($CURL_DIR/include)
-			PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
-			PHP_EVAL_LIBLINE(`$CURL_CONFIG --libs`, HTTP_SHARED_LIBADD)
-			AC_DEFINE([PHP_HTTP_HAVE_CURL], [1], [Have libcurl support])
-			HTTP_HAVE_A_REQUEST_LIB=true
+		])
+		if $PECL_CACHE_VAR([HAVE_UIDNA_NAMETOASCII_UTF8]); then
+			PECL_DEFINE([HAVE_IDNA2008])
+			PECL_DEFINE_FN([uidna_nameToASCII_UTF8])
 		fi
+		PECL_CHECK_DONE(libicu, [$PECL_VAR([HAVE_LIBICU])])
 	fi
 
-dnl ----
-dnl EVENT
-dnl ----
-
-	if test "$PHP_HTTP_LIBEVENT_DIR" = "no"; then
-		AC_DEFINE([PHP_HTTP_HAVE_EVENT], [0], [ ])
-	else
-		AC_MSG_CHECKING([for event2/event.h])
-		EVENT_DIR=
-		for i in "$PHP_HTTP_LIBEVENT_DIR" /usr/local /usr /opt; do
-			if test -f "$i/include/event.h"; then
-				EVENT_DIR=$i
-				break
-			fi
-		done
-		if test "x$EVENT_DIR" = "x"; then
-			AC_MSG_RESULT([not found])
-			AC_MSG_WARN([continuing without libevent support])
-			AC_DEFINE([PHP_HTTP_HAVE_EVENT], [0], [ ])
+	dnl IDNKIT2
+	PHP_ARG_WITH([http-libidnkit2-dir], [whether/where to check for libidnkit2],
+	[  --with-http-libidnkit2-dir[=DIR]   HTTP: where to find libidnkit2], $PHP_HTTP_LIBCURL_DIR, no)
+	if test "$PHP_HTTP_LIBIDNKIT2_DIR" != "no"; then
+		PECL_CHECK_CUSTOM(libidnkit2, "$PHP_HTTP_LIBIDNKIT2_DIR", idn/api.h, idnkit,
+			[$($EGREP "define IDNKIT_VERSION_LIBIDN\b" "include/idn/version.h" | $SED -e's/^.*VERSION_LIBIDN//g' -e 's/@<:@^0-9\.@:>@//g')])
+		if $PECL_VAR([HAVE_LIBIDNKIT2]); then
+			PECL_DEFINE([HAVE_IDNA2008])
+		fi
+		PECL_CHECK_DONE(libidnkit2, [$PECL_VAR([HAVE_LIBIDNKIT2])])
+	fi
+	dnl IDNKIT1
+	PHP_ARG_WITH([http-libidnkit-dir], [whether/where to check for libidnkit],
+	[  --with-http-libidnkit-dir[=DIR]    HTTP: where to find libidnkit], $PHP_HTTP_LIBCURL_DIR, no)
+	if test "$PHP_HTTP_LIBIDNKIT_DIR" != "no"; then
+		# libidnkit1 and libidnkit2 have the same API
+		if test "$PHP_HTTP_LIBIDNKIT2_DIR" != no && $PECL_VAR([HAVE_LIBIDNKIT2]); then
+			AC_MSG_WARN([libidnkit-$PECL_VAR([LIBIDNKIT2_VERSION]) already enabled, skipping libidnkit1])
 		else
-			AC_MSG_RESULT([found in $EVENT_DIR])
-			
-			AC_MSG_CHECKING([for libevent version, roughly])
-			
-			if test -f "$EVENT_DIR/include/event2/event.h"; then
-				EVENT_VER="`$AWK '/_EVENT_VERSION/ {gsub(/\"/,\"\",$3); print $3}' < $EVENT_DIR/include/event2/event-config.h`"
-				AC_DEFINE([PHP_HTTP_HAVE_EVENT2], [1], [ ])
-			else
-				AC_DEFINE([PHP_HTTP_HAVE_EVENT2], [0], [ ])
-				if test -f "$EVENT_DIR/include/evhttp.h" && test -f "$EVENT_DIR/include/evdns.h"; then
-					if test -f "$EVENT_DIR/include/evrpc.h"; then
-						EVENT_VER="1.4 or greater"
-					else
-						EVENT_VER="1.2 or greater"
-					fi
-				else
-					EVENT_VER="1.1b or lower"
-				fi
+			PECL_CHECK_CUSTOM(libidnkit, "$PHP_HTTP_LIBIDNKIT_DIR", idn/api.h, idnkit,
+				[$($EGREP "define IDNKIT_VERSION\b" "include/idn/version.h" | $SED -e's/^.*VERSION//g' -e 's/@<:@^0-9\.@:>@//g')])
+			if $PECL_VAR([HAVE_LIBIDNKIT]); then
+				PECL_DEFINE([HAVE_IDNA2003])
 			fi
-			AC_DEFINE_UNQUOTED([PHP_HTTP_EVENT_VERSION], ["$EVENT_VER"], [ ])
-			AC_MSG_RESULT([$EVENT_VER])
-			
-			PHP_ADD_INCLUDE($EVENT_DIR/include)
-			PHP_ADD_LIBRARY_WITH_PATH(event, $EVENT_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
-			AC_DEFINE([PHP_HTTP_HAVE_EVENT], [1], [Have libevent support for cURL])
+			PECL_CHECK_DONE(libidnkit, [$PECL_VAR([HAVE_LIBIDNKIT])])
 		fi
 	fi
 
-dnl ----
-dnl RAPHF
-dnl ----
-	HTTP_HAVE_PHP_EXT([raphf], [
-		AC_MSG_CHECKING([for php_raphf.h])
-		HTTP_EXT_RAPHF_INCDIR=
-		for i in `echo $INCLUDES | $SED -e's/-I//g'` $abs_srcdir ../raphf; do
-			if test -d $i; then
-				if test -f $i/php_raphf.h; then
-					HTTP_EXT_RAPHF_INCDIR=$i
-					break
-				elif test -f $i/ext/raphf/php_raphf.h; then
-					HTTP_EXT_RAPHF_INCDIR=$i/ext/raphf
-					break
-				fi
-			fi
-		done
-		if test "x$HTTP_EXT_RAPHF_INCDIR" = "x"; then
-			AC_MSG_ERROR([not found])
-		else
-			AC_MSG_RESULT([$HTTP_EXT_RAPHF_INCDIR])
-			AC_DEFINE([PHP_HTTP_HAVE_PHP_RAPHF_H], [1], [Have ext/raphf support])
-			PHP_ADD_INCLUDE([$HTTP_EXT_RAPHF_INCDIR])
-		fi
+	dnl EXTENSIONS
+	PECL_HAVE_PHP_EXT([raphf], [
+		PECL_HAVE_PHP_EXT_HEADER([raphf])
 	], [
-		AC_MSG_ERROR([Please install pecl/raphf and activate extension=raphf.$SHLIB_DL_SUFFIX_NAME in your php.ini])
+		AC_MSG_ERROR([please install and enable pecl/raphf])
 	])
-
-dnl ----
-dnl PROPRO
-dnl ----
-	HTTP_HAVE_PHP_EXT([propro], [
-		AC_MSG_CHECKING([for php_propro.h])
-		HTTP_EXT_PROPRO_INCDIR=
-		for i in `echo $INCLUDES | $SED -e's/-I//g'` $abs_srcdir ../propro; do
-			if test -d $i; then
-				if test -f $i/php_propro.h; then
-					HTTP_EXT_PROPRO_INCDIR=$i
-					break
-				elif test -f $i/ext/propro/php_propro.h; then
-					HTTP_EXT_PROPRO_INCDIR=$i/ext/propro
-					break
-				fi
-			fi
-		done
-		if test "x$HTTP_EXT_PROPRO_INCDIR" = "x"; then
-			AC_MSG_ERROR([not found])
-		else
-			AC_MSG_RESULT([$HTTP_EXT_PROPRO_INCDIR])
-			AC_DEFINE([PHP_HTTP_HAVE_PHP_PROPRO_H], [1], [Have ext/propro support])
-			PHP_ADD_INCLUDE([$HTTP_EXT_PROPRO_INCDIR])
-		fi
+	PECL_HAVE_PHP_EXT([propro], [
+		PECL_HAVE_PHP_EXT_HEADER([propro])
 	], [
-		AC_MSG_ERROR([Please install pecl/propro and activate extension=propro.$SHLIB_DL_SUFFIX_NAME in your php.ini])
+		AC_MSG_ERROR([please install and enable pecl/propro])
 	])
+	PECL_HAVE_PHP_EXT([hash])
+	PECL_HAVE_PHP_EXT([iconv])
 
-PHP_ARG_WITH([http-shared-deps], [whether to depend on extensions which have been built shared],
-[  --without-http-shared-deps   HTTP: do not depend on extensions like hash
-                                     and iconv (when they are built shared)], $PHP_HTTP, $PHP_HTTP)
-dnl ----
-dnl HASH
-dnl ----
-	HTTP_HAVE_PHP_EXT([hash], [
-		AC_MSG_CHECKING([for php_hash.h])
-		HTTP_EXT_HASH_INCDIR=
-		for i in `echo $INCLUDES | $SED -e's/-I//g'` $abs_srcdir ../hash; do
-			if test -d $i; then
-				if test -f $i/php_hash.h; then
-					HTTP_EXT_HASH_INCDIR=$i
-					break
-				elif test -f $i/ext/hash/php_hash.h; then
-					HTTP_EXT_HASH_INCDIR=$i/ext/hash
-					break
-				fi
-			fi
-		done
-		if test "x$HTTP_EXT_HASH_INCDIR" = "x"; then
-			AC_MSG_RESULT([not found])
-		else
-			AC_MSG_RESULT([$HTTP_EXT_HASH_INCDIR])
-			AC_DEFINE([PHP_HTTP_HAVE_PHP_HASH_H], [1], [Have ext/hash support])
-			PHP_ADD_INCLUDE([$HTTP_EXT_HASH_INCDIR])
-		fi
-	])
+	dnl DONE
+	PHP_SUBST([HTTP_SHARED_LIBADD])
 
-dnl ----
-dnl JSON
-dnl ----
-	HTTP_HAVE_PHP_EXT([json])
+	PECL_VAR([SRCDIR])=PHP_EXT_SRCDIR(http)
+	PECL_VAR([BUILDDIR])=PHP_EXT_BUILDDIR(http)
 
+	PHP_ADD_INCLUDE([$PECL_VAR([SRCDIR])/src])
+	PHP_ADD_BUILD_DIR([$PECL_VAR([BUILDDIR])/src])
 
-dnl ----
-dnl ICONV
-dnl ----
-	HTTP_HAVE_PHP_EXT([iconv])
+	PECL_VAR([HEADERS])=$(cd $PECL_VAR([SRCDIR])/src && echo *.h)
+	PECL_VAR([SOURCES])=$(cd $PECL_VAR([SRCDIR]) && echo src/*.c)
 
-dnl ----
-dnl DONE
-dnl ----
-	PHP_HTTP_SOURCES="\
-		php_http_buffer.c \
-		php_http.c \
-		php_http_client.c \
-		php_http_client_curl.c \
-		php_http_client_request.c \
-		php_http_client_response.c \
-		php_http_cookie.c \
-		php_http_curl.c \
-		php_http_encoding.c \
-		php_http_env.c \
-		php_http_env_request.c \
-		php_http_env_response.c \
-		php_http_etag.c \
-		php_http_exception.c \
-		php_http_filter.c \
-		php_http_header_parser.c \
-		php_http_header.c \
-		php_http_info.c \
-		php_http_message_body.c \
-		php_http_message.c \
-		php_http_message_parser.c \
-		php_http_misc.c \
-		php_http_negotiate.c \
-		php_http_object.c \
-		php_http_options.c \
-		php_http_params.c \
-		php_http_querystring.c \
-		php_http_strlist.c \
-		php_http_url.c \
-		php_http_version.c \
-	"
-	PHP_NEW_EXTENSION([http], $PHP_HTTP_SOURCES, $ext_shared)
-	
-	dnl shared extension deps
-	HTTP_SHARED_DEP([hash])
-	HTTP_SHARED_DEP([iconv])
-	HTTP_SHARED_DEP([json])
-	
-	dnl extension deps
+	PHP_NEW_EXTENSION(http, [$PECL_VAR([SOURCES])], [$ext_shared])
+	PHP_INSTALL_HEADERS(ext/http, [php_http.h $PECL_VAR([HEADERS])])
+
+	PHP_ARG_WITH([http-shared-deps], [whether to depend on extensions which have been built shared],
+	[  --without-http-shared-deps       HTTP: do not depend on extensions like hash
+                                         and iconv (when they are built shared)], yes, no)
+	if test "$PHP_HTTP_SHARED_DEPS" != "no"; then
+		if $PECL_VAR([HAVE_EXT_HASH]); then
+			PHP_ADD_EXTENSION_DEP([http], [hash], true)
+		fi
+		if $PECL_VAR([HAVE_EXT_ICONV]); then
+			PHP_ADD_EXTENSION_DEP([http], [iconv], true)
+		fi
+	fi
 	PHP_ADD_EXTENSION_DEP([http], [raphf], true)
-	PHP_ADD_EXTENSION_DEP([http], [propo], true)
-	
-	PHP_SUBST([HTTP_SHARED_LIBADD])
+	PHP_ADD_EXTENSION_DEP([http], [propro], true)
+
+	PHP_SUBST(PECL_VAR([HEADERS]))
+	PHP_SUBST(PECL_VAR([SOURCES]))
+
+	PHP_SUBST(PECL_VAR([SRCDIR]))
+	PHP_SUBST(PECL_VAR([BUILDDIR]))
 
-	PHP_HTTP_HEADERS="
-		php_http_api.h \
-		php_http_buffer.h \
-		php_http_curl_client.h \
-		php_http_curl_client_datashare.h \
-		php_http_client_datashare.h \
-		php_http_client_factory.h \
-		php_http_client.h \
-		php_http_client_interface.h \
-		php_http_curl_client_pool.h \
-		php_http_client_pool.h \
-		php_http_client_request.h \
-		php_http_client_response.h \
-		php_http_cookie.h \
-		php_http_curl.h \
-		php_http_encoding.h \
-		php_http_env.h \
-		php_http_env_request.h \
-		php_http_env_response.h \
-		php_http_etag.h \
-		php_http_exception.h \
-		php_http_filter.h \
-		php_http.h \
-		php_http_header_parser.h \
-		php_http_header.h \
-		php_http_info.h \
-		php_http_message_body.h \
-		php_http_message.h \
-		php_http_message_parser.h \
-		php_http_misc.h \
-		php_http_negotiate.h \
-		php_http_object.h \
-		php_http_options.h \
-		php_http_params.h \
-		php_http_querystring.h \
-		php_http_strlist.h \
-		php_http_url.h \
-		php_http_version.h \
-	"
-	PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADERS)
+	PHP_ADD_MAKEFILE_FRAGMENT
 
 	AC_DEFINE([HAVE_HTTP], [1], [Have extended HTTP support])
 fi