X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config9.m4;h=d4e211ecd1bd304ca54d00be6b27e8e0d19378c9;hp=73783c1af92e8bdfdc0dca67d63e9f150b578a3e;hb=a5df2b0848bd62fde66253f0dd825708b9dc0360;hpb=ebecc38999eaa447a92ec526fc510965223d6f02

diff --git a/config9.m4 b/config9.m4
index 73783c1..dda5b01 100644
--- a/config9.m4
+++ b/config9.m4
@@ -1,449 +1,203 @@
-dnl config.m4 for pecl/http
-dnl $Id$
-dnl vim: noet ts=1 sw=1
 
-PHP_ARG_ENABLE([http], [whether to enable extended HTTP support],
-[  --enable-http           Enable extended HTTP support])
-PHP_ARG_WITH([http-shared-deps], [whether to depend on extensions which have been built shared],
-[  --with-http-shared-deps
-                           HTTP: disable to not depend on extensions like hash,
-                                 iconv and session (when built shared)], $PHP_HTTP, $PHP_HTTP)
-PHP_ARG_WITH([http-curl-requests], [whether to enable cURL HTTP request support],
-[  --with-http-curl-requests[=LIBCURLDIR]
-                           HTTP: with cURL request support], $PHP_HTTP, $PHP_HTTP)
-PHP_ARG_WITH([http-curl-libevent], [whether to enable libevent support fur cURL],
-[  --with-http-curl-libevent[=LIBEVENTDIR]
-                           HTTP: libevent install directory], $PHP_HTTP_CURL_REQUESTS, "")
-PHP_ARG_WITH([http-zlib-compression], [whether to enable zlib encodings support],
-[  --with-http-zlib-compression[=LIBZDIR]
-                           HTTP: with zlib encodings support], $PHP_HTTP, $PHP_HTTP)
-PHP_ARG_WITH([http-magic-mime], [whether to enable response content type guessing],
-[  --with-http-magic-mime[=LIBMAGICDIR]
-                           HTTP: with magic mime response content type guessing], "no", "no")
+m4_foreach(dir, [., ext/http], [
+	sinclude(dir/autoconf/pecl/pecl.m4)
+	sinclude(dir/autoconf/pecl/zlib.m4)
+	sinclude(dir/autoconf/pecl/libcurl.m4)
+	sinclude(dir/autoconf/pecl/libevent.m4)
+])
 
-if test "$PHP_HTTP" != "no"; then
+PECL_INIT([http])
 
-	ifdef([AC_PROG_EGREP], [
-		AC_PROG_EGREP
-	], [
-		AC_CHECK_PROG(EGREP, egrep, egrep)
+PHP_ARG_WITH([http], [whether to enable extended HTTP support],
+[  --with-http             Enable extended HTTP support])
+if test "$PHP_HTTP" != "no"; then
+	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])
+	AC_CHECK_FUNC(gethostname,,[
+		AC_CHECK_LIB(nsl, gethostname)
 	])
-	ifdef([AC_PROG_SED], [
-		AC_PROG_SED
-	], [
-		ifdef([LT_AC_PROG_SED], [
-			LT_AC_PROG_SED
-		], [
-			AC_CHECK_PROG(SED, sed, sed)
-		])
+	AC_CHECK_FUNC(getdomainname,,[
+		AC_CHECK_LIB(nsl, getdomainname)
 	])
-	
-	if test "$PHP_HTTP_SHARED_DEPS" != "no"; then
-		AC_DEFINE([HTTP_SHARED_DEPS], [1], [ ])
-	else
-		AC_DEFINE([HTTP_SHARED_DEPS], [0], [ ])
+	AC_CHECK_FUNCS(mbrtowc mbtowc iswalnum inet_pton)
+
+	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 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
-	
-	dnl
-	dnl HTTP_SHARED_DEP(name[, code-if-yes[, code-if-not]])
-	dnl
-	AC_DEFUN([HTTP_SHARED_DEP], [
-		extname=$1
-		haveext=$[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])
-			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__)
-		ishared=$[PHP_]translit($1,a-z_-,A-Z__)_SHARED
-		
-		AC_MSG_CHECKING([for ext/$extname support])
-		if test -x "$PHP_EXECUTABLE"; then
-			if test "`$PHP_EXECUTABLE -m | $EGREP ^$extname\$`" = "$extname"; then
-				[HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)=1
-				AC_MSG_RESULT([yes])
-				$2
-			else
-				[HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)=
-				AC_MSG_RESULT([no])
-				$3
-			fi
-		elif test "$haveext" != "no" && test "x$haveext" != "x"; then
-			[HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)=1
-			AC_MSG_RESULT([yes])
-			$2
-		else
-			[HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)=
-			AC_MSG_RESULT([no])
-			$3
-		fi
-	])
 
-dnl ----
-dnl STDC
-dnl ----
-	AC_CHECK_HEADERS([netdb.h unistd.h])
-	PHP_CHECK_FUNC(gethostname, nsl)
-	PHP_CHECK_FUNC(getdomainname, nsl)
-	PHP_CHECK_FUNC(getservbyport, nsl)
-	PHP_CHECK_FUNC(getservbyname, nsl)
+	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 ----
-	if test "$PHP_HTTP_ZLIB_COMPRESSION" != "no"; then
-		AC_MSG_CHECKING([for zlib.h])
-		ZLIB_DIR=
-		for i in "$PHP_HTTP_ZLIB_COMPRESSION" "$PHP_ZLIB_DIR" "$PHP_ZLIB" /usr/local /usr /opt; do
-			if test -f "$i/include/zlib.h"; then
-				ZLIB_DIR=$i
-				break;
-			fi
-		done
-		if test -z "$ZLIB_DIR"; 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([libz 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)
-				AC_DEFINE([HTTP_HAVE_ZLIB], [1], [Have zlib support])
-			fi
+	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
+		PECL_CHECK_DONE(libidn2, $PECL_VAR([HAVE_LIBIDN2]))
 	fi
-	
-dnl ----
-dnl CURL
-dnl ----
-	if test "$PHP_HTTP_CURL_REQUESTS" != "no"; then
-		AC_MSG_CHECKING([for curl/curl.h])
-		CURL_DIR=
-		for i in "$PHP_HTTP_CURL_REQUESTS" /usr/local /usr /opt; do
-			if test -f "$i/include/curl/curl.h"; then
-				CURL_DIR=$i
-				break
-			fi
-		done
-		if test -z "$CURL_DIR"; then
-			AC_MSG_RESULT([not found])
-			AC_MSG_ERROR([could not find curl/curl.h])
-		else
-			AC_MSG_RESULT([found in $CURL_DIR])
+	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
-		
-		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
+		PECL_CHECK_DONE(libidn, $PECL_VAR([HAVE_LIBIDN]))
+	fi
+
+	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
 			fi
-		done
-		if test -z "$CURL_CONFIG"; then
-			AC_MSG_RESULT([not found])
-			AC_MSG_ERROR([could not find curl-config])
-		else
-			AC_MSG_RESULT([found: $CURL_CONFIG])
-		fi
-		
-		dnl Debian stable has currently 7.13.2 (this is not a typo)
-		AC_MSG_CHECKING([for curl version >= 7.12.3])
-		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 71203; then
-			AC_MSG_ERROR([libcurl version greater or equal to 7.12.3 required])
-		fi
-		
-		AC_PROG_CPP
-		AC_MSG_CHECKING([for SSL support in libcurl])
-		CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
-		if test "$CURL_SSL" = "SSL"; then
-			AC_MSG_RESULT([yes])
-			AC_DEFINE([HTTP_HAVE_SSL], [1], [ ])
-			
-			save_CFLAGS="$CFLAGS"
-			CFLAGS="`$CURL_CONFIG --cflags`"
-			save_LDFLAGS="$LDFALGS"
-			LDFLAGS="`$CURL_CONFIG --libs` $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR"
-			
-			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_TRY_LINK([
+				#include <unicode/uidna.h>
 			], [
-				AC_MSG_RESULT([yes])
-				AC_CHECK_HEADER([openssl/crypto.h], [
-					AC_DEFINE([HTTP_HAVE_OPENSSL], [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([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;
-				}
+		])
+		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([yes])
-				AC_CHECK_HEADER([gcrypt.h], [
-					AC_DEFINE([HTTP_HAVE_GNUTLS], [1], [ ])
-				])
+				uidna_nameToASCII_UTF8(0, 0, 0, 0, 0, 0, 0);
 			], [
-				AC_MSG_RESULT([no])
+				PECL_CACHE_VAR([HAVE_UIDNA_NAMETOASCII_UTF8])=yes
 			], [
-				AC_MSG_RESULT([no])
+				PECL_CACHE_VAR([HAVE_UIDNA_NAMETOASCII_UTF8])=no
 			])
-			
-			CFLAGS="$save_CFLAGS"
-			LDFLAGS="$save_LDFLAGS"
-		else
-			AC_MSG_RESULT([no])
-		fi
-		
-		AC_MSG_CHECKING([for bundled SSL CA info])
-		CURL_CAINFO=
-		for i in `$CURL_CONFIG --ca` "/etc/ssl/certs/ca-certificates.crt"; do
-			if test -f "$i"; then
-				CURL_CAINFO="$i"
-				break
-			fi
-		done
-		if test -z "$CURL_CAINFO"; then
-			AC_MSG_RESULT([not found])
-		else
-			AC_MSG_RESULT([$CURL_CAINFO])
-			AC_DEFINE_UNQUOTED([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_LIBS, HTTP_SHARED_LIBADD)
-		AC_DEFINE([HTTP_HAVE_CURL], [1], [Have cURL support])
-		
-		PHP_CHECK_LIBRARY(curl, curl_share_strerror, 
-			[AC_DEFINE([HAVE_CURL_SHARE_STRERROR], [1], [ ])], [ ],
-			[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
-		)
-		PHP_CHECK_LIBRARY(curl, curl_multi_strerror, 
-			[AC_DEFINE([HAVE_CURL_MULTI_STRERROR], [1], [ ])], [ ], 
-			[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
-		)
-		PHP_CHECK_LIBRARY(curl, curl_easy_strerror,
-			[AC_DEFINE([HAVE_CURL_EASY_STRERROR], [1], [ ])], [ ],
-			[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
-		)
-		PHP_CHECK_LIBRARY(curl, curl_easy_reset,
-			[AC_DEFINE([HAVE_CURL_EASY_RESET], [1], [ ])], [ ],
-			[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
-		)
-		dnl Debian suddenly (>=7.14.1-2) hides all symbols not starting with "curl"
-		PHP_CHECK_LIBRARY(curl, Curl_getFormData,
-			[AC_DEFINE([HAVE_CURL_GETFORMDATA], [1], [ ])], [ ],
-			[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
-		)
-		dnl New API function which obsoletes use of Curl_getFormData (>=7.15.5)
-		PHP_CHECK_LIBRARY(curl, curl_formget,
-			[AC_DEFINE([HAVE_CURL_FORMGET], [1], [ ])], [ ],
-			[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
-		)
-		PHP_CHECK_LIBRARY(curl, curl_multi_setopt, 
-			[AC_DEFINE([HAVE_CURL_MULTI_SETOPT], [1], [ ])], [ ], 
-			[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
-		)
-		PHP_CHECK_LIBRARY(curl, curl_multi_timeout, 
-			[AC_DEFINE([HAVE_CURL_MULTI_TIMEOUT], [1], [ ])], [ ],
-			[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
-		)
-		
-		dnl ----
-		dnl EVENT
-		dnl ----
-		
-		if test "$PHP_HTTP_CURL_LIBEVENT" != "no"; then
-			AC_MSG_CHECKING([for event.h])
-			EVENT_DIR=
-			for i in "$PHP_HTTP_CURL_LIBEVENT" /usr/local /usr /opt; do
-				if test -f "$i/include/event.h"; then
-					EVENT_DIR=$i
-					break
-				fi
-			done
-			if test -z "$EVENT_DIR"; then
-				AC_MSG_RESULT([not found])
-				AC_MSG_WARN([continuing without libevent support])
-			else
-				AC_MSG_RESULT([found in $EVENT_DIR])
-				
-				AC_MSG_CHECKING([for libevent version, roughly])
-				EVENT_VER="1.1b or lower"
-				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
-				fi
-				AC_DEFINE_UNQUOTED([HTTP_EVENT_VERSION], ["$EVENT_VER"], [ ])
-				AC_MSG_RESULT([$EVENT_VER])
-				
-				AC_MSG_CHECKING([for libcurl version >= 7.16.0])
-				AC_MSG_RESULT([$CURL_VERSION])
-				if test `echo $CURL_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71600; then
-					AC_MSG_WARN([libcurl version greater or equal to 7.16.0 required; continuing without libevent support])
-				else
-					PHP_ADD_INCLUDE($EVENT_DIR/include)
-					PHP_ADD_LIBRARY_WITH_PATH(event, $EVENT_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
-					AC_DEFINE([HTTP_HAVE_EVENT], [1], [Have libevent support for cURL])
-					PHP_CHECK_LIBRARY(curl, curl_multi_socket_action, 
-						[AC_DEFINE([HAVE_CURL_MULTI_SOCKET_ACTION], [1], [ ])], [ ],
-						[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
-					)
-				fi
-			fi
+		])
+		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 MAGIC
-dnl ----
-	if test "$PHP_HTTP_MAGIC_MIME" != "no"; then
-		AC_MSG_CHECKING([for magic.h])
-		MAGIC_DIR=
-		for i in "$PHP_HTTP_MAGIC_MIME" /usr/local /usr /opt; do
-			if test -f "$i/include/magic.h"; then
-				MAGIC_DIR=$i
-				break
-			fi
-		done
-		if test -z "$MAGIC_DIR"; then
-			AC_MSG_RESULT([not found])
-			AC_MSG_ERROR([could not find magic.h])
-		else
-			AC_MSG_RESULT([found in $MAGIC_DIR])
+	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
-		
-		PHP_ADD_INCLUDE($MAGIC_DIR/include)
-		PHP_ADD_LIBRARY_WITH_PATH(magic, $MAGIC_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
-		AC_DEFINE([HTTP_HAVE_MAGIC], [1], [Have magic mime support])
+		PECL_CHECK_DONE(libidnkit2, [$PECL_VAR([HAVE_LIBIDNKIT2])])
 	fi
-
-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 -z "$HTTP_EXT_HASH_INCDIR"; then
-			AC_MSG_RESULT([not found])
+	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([$HTTP_EXT_HASH_INCDIR])
-			AC_DEFINE([HTTP_HAVE_PHP_HASH_H], [1], [Have ext/hash support])
-			PHP_ADD_INCLUDE([$HTTP_EXT_HASH_INCDIR])
+			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
+			PECL_CHECK_DONE(libidnkit, [$PECL_VAR([HAVE_LIBIDNKIT])])
 		fi
+	fi
+
+	dnl EXTENSIONS
+	PECL_HAVE_PHP_EXT([raphf], [
+		PECL_HAVE_PHP_EXT_HEADER([raphf])
+	], [
+		AC_MSG_ERROR([please install and enable pecl/raphf])
+	])
+	PECL_HAVE_PHP_EXT([propro], [
+		PECL_HAVE_PHP_EXT_HEADER([propro])
+	], [
+		AC_MSG_ERROR([please install and enable pecl/propro])
 	])
+	PECL_HAVE_PHP_EXT([hash])
+	PECL_HAVE_PHP_EXT([iconv])
+
+	dnl DONE
+	PHP_SUBST([HTTP_SHARED_LIBADD])
 
-dnl ----
-dnl ICONV
-dnl ----
-	HTTP_HAVE_PHP_EXT([iconv])
+	PECL_VAR([SRCDIR])=PHP_EXT_SRCDIR(http)
+	PECL_VAR([BUILDDIR])=PHP_EXT_BUILDDIR(http)
 
-dnl ----
-dnl SESSION
-dnl ----
-	HTTP_HAVE_PHP_EXT([session])
+	PHP_ADD_INCLUDE([$PECL_VAR([SRCDIR])/src])
+	PHP_ADD_BUILD_DIR([$PECL_VAR([BUILDDIR])/src])
 
-dnl ----
-dnl DONE
-dnl ----
-	PHP_HTTP_SOURCES="missing.c http.c http_functions.c phpstr/phpstr.c \
-		http_util_object.c http_message_object.c http_request_object.c http_request_pool_api.c \
-		http_response_object.c http_exception_object.c http_requestpool_object.c \
-		http_api.c http_cache_api.c http_request_api.c http_request_info.c http_date_api.c \
-		http_headers_api.c http_message_api.c http_send_api.c http_url_api.c \
-		http_info_api.c http_request_method_api.c http_encoding_api.c \
-		http_filter_api.c http_request_body_api.c http_querystring_object.c \
-		http_deflatestream_object.c http_inflatestream_object.c http_cookie_api.c \
-		http_querystring_api.c http_request_datashare_api.c http_requestdatashare_object.c \
-		http_persistent_handle_api.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([session])
-	
-	PHP_ADD_BUILD_DIR($ext_builddir/phpstr, 1)
-	PHP_SUBST([HTTP_SHARED_LIBADD])
+	PECL_VAR([HEADERS])=$(cd $PECL_VAR([SRCDIR])/src && echo *.h)
+	PECL_VAR([SOURCES])=$(cd $PECL_VAR([SRCDIR]) && echo src/*.c)
 
-	PHP_HTTP_HEADERS="php_http_std_defs.h php_http.h php_http_api.h php_http_cache_api.h \
-		php_http_date_api.h php_http_headers_api.h php_http_info_api.h php_http_message_api.h \
-		php_http_request_api.h php_http_request_method_api.h php_http_send_api.h php_http_url_api.h \
-		php_http_encoding_api.h phpstr/phpstr.h missing.h php_http_request_body_api.h \
-		php_http_exception_object.h php_http_message_object.h php_http_request_object.h \
-		php_http_requestpool_object.h php_http_response_object.h php_http_util_object.h \
-		php_http_querystring_object.h php_http_deflatestream_object.h php_http_inflatestream_object.h \
-		php_http_cookie_api.h php_http_querystring_api.h php_http_request_datashare_api.h php_http_requestdatashare_object.h \
-		php_http_persistent_handle_api.h"
-	ifdef([PHP_INSTALL_HEADERS], [
-		PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADERS)
-	], [
-		PHP_SUBST([PHP_HTTP_HEADERS])
-		PHP_ADD_MAKEFILE_FRAGMENT
-	])
+	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], [propro], true)
+
+	PHP_SUBST(PECL_VAR([HEADERS]))
+	PHP_SUBST(PECL_VAR([SOURCES]))
+
+	PHP_SUBST(PECL_VAR([SRCDIR]))
+	PHP_SUBST(PECL_VAR([BUILDDIR]))
+
+	PHP_ADD_MAKEFILE_FRAGMENT
 
 	AC_DEFINE([HAVE_HTTP], [1], [Have extended HTTP support])
 fi