X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config9.m4;h=3b1f7015554d1683469836e9548efd85b2eb0a08;hp=457e59859d8776f9abc6b03972d4fc9bb7e0a957;hb=a760e170d36cc40ce992ebcdb13f0877ddfa3d73;hpb=89d4217ed873aa9ed8bee1faf0d31bb52c911ae6

diff --git a/config9.m4 b/config9.m4
index 457e598..3b1f701 100644
--- a/config9.m4
+++ b/config9.m4
@@ -10,6 +10,8 @@ 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
 
@@ -68,7 +70,6 @@ if test "$PHP_HTTP" != "no"; then
 	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\$`
@@ -96,13 +97,37 @@ if test "$PHP_HTTP" != "no"; then
 dnl ----
 dnl STDC
 dnl ----
-	AC_CHECK_HEADERS([netdb.h unistd.h])
+	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(getservbyport, nsl)
-	PHP_CHECK_FUNC(getservbyport_r, nsl)
-	PHP_CHECK_FUNC(getservbyname, nsl)
-	PHP_CHECK_FUNC(getservbyname_r, nsl)
+	PHP_CHECK_FUNC(mbrtowc)
+	PHP_CHECK_FUNC(mbtowc)
+	PHP_CHECK_FUNC(iswalnum)
+	PHP_CHECK_FUNC(inet_pton)
+
+dnl ----
+dnl IDN
+dnl ----
+
+	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)
+	fi
 
 dnl ----
 dnl ZLIB
@@ -193,7 +218,7 @@ dnl ----
 		
 			AC_MSG_CHECKING([for SSL support in libcurl])
 			CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
-			CURL_SSL_LIBS=()
+			CURL_SSL_LIBS=""
 			if test "$CURL_SSL" = "SSL"; then
 				AC_MSG_RESULT([yes])
 				AC_DEFINE([PHP_HTTP_HAVE_SSL], [1], [ ])
@@ -215,7 +240,7 @@ dnl ----
 					AC_CHECK_HEADER([openssl/ssl.h], [
 						AC_CHECK_HEADER([openssl/crypto.h], [
 							AC_DEFINE([PHP_HTTP_HAVE_OPENSSL], [1], [ ])
-							CURL_SSL_LIBS=(ssl crypto)
+							CURL_SSL_LIBS="ssl crypto"
 						])
 					])
 				], [
@@ -241,7 +266,7 @@ dnl ----
 					AC_CHECK_HEADER([gnutls.h], [
 						AC_CHECK_HEADER([gcrypt.h], [
 							AC_DEFINE([PHP_HTTP_HAVE_GNUTLS], [1], [ ])
-							CURL_SSL_LIBS=(gnutls gcrypt)
+							CURL_SSL_LIBS="gnutls gcrypt"
 						])
 					])
 				], [
@@ -252,15 +277,36 @@ dnl ----
 			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_MSG_RESULT([yes])
+				AC_DEFINE([PHP_HTTP_HAVE_ARES], [1], [ ])
+			], [
+				AC_MSG_RESULT([no])
+			], [
+				AC_MSG_RESULT([no])
+			])
 		
 			INCLUDES="$save_INCLUDES"
 			LIBS="$save_LIBS"
 			CFLAGS="$save_CFLAGS"
 			LDFLAGS="$save_LDFLAGS"
 			
-			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
+			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
 		
@@ -312,7 +358,7 @@ dnl ----
 			AC_MSG_CHECKING([for libevent version, roughly])
 			
 			if test -f "$EVENT_DIR/include/event2/event.h"; then
-				EVENT_VER="`$EGREP _EVENT_VERSION $EVENT_DIR/include/event2/event-config.h | $AWK '{print $3}'`"
+				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], [ ])
@@ -360,7 +406,7 @@ dnl ----
 			PHP_ADD_INCLUDE([$HTTP_EXT_RAPHF_INCDIR])
 		fi
 	], [
-		AC_MSG_ERROR([Please install pecl/raphf])
+		AC_MSG_ERROR([Please install pecl/raphf and activate extension=raphf.$SHLIB_DL_SUFFIX_NAME in your php.ini])
 	])
 
 dnl ----
@@ -388,7 +434,7 @@ dnl ----
 			PHP_ADD_INCLUDE([$HTTP_EXT_PROPRO_INCDIR])
 		fi
 	], [
-		AC_MSG_ERROR([Please install pecl/propro])
+		AC_MSG_ERROR([Please install pecl/propro and activate extension=propro.$SHLIB_DL_SUFFIX_NAME in your php.ini])
 	])
 
 PHP_ARG_WITH([http-shared-deps], [whether to depend on extensions which have been built shared],