X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config9.m4;h=ea6c692a3f2ae2e9d001f89301517fc8f454d990;hp=00ff2aa9d641d93c95560669c70bb39e7b01b1f8;hb=76f74c9bfd2e97c89e7184d85ea7a0c5322a5219;hpb=0ee6755121a35b2e7bcca536f19c8d34d2b9ba6b

diff --git a/config9.m4 b/config9.m4
index 00ff2aa..ea6c692 100644
--- a/config9.m4
+++ b/config9.m4
@@ -100,7 +100,9 @@ dnl ----
 	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)
 
 dnl ----
 dnl ZLIB
@@ -129,40 +131,6 @@ dnl ----
 		fi
 	fi
 	
-dnl ----
-dnl SERF
-dnl ----
-dnl
-dnl	if test "$PHP_HTTP_LIBSERF_DIR" = "no"; then
-dnl		AC_DEFINE([PHP_HTTP_HAVE_SERF], [0], [ ])
-dnl	else
-dnl		AC_MSG_CHECKING([for serf-?/serf.h])
-dnl		SERF_DIR=
-dnl		for i in "$PHP_HTTP_LIBSERF_DIR" /usr/local /usr /opt; do
-dnl			if test -f "$i/include/serf-0/serf.h"; then
-dnl				SERF_DIR=$i
-dnl				SERF_VER=0
-dnl				break
-dnl			elif test -f "$i/include/serf-1/serf.h"; then
-dnl				SERF_DIR=$i
-dnl				SERF_VER=1
-dnl			fi
-dnl		done
-
-dnl		if test "x$SERF_DIR" = "x"; then
-dnl			AC_MSG_RESULT([not found])
-dnl			AC_DEFINE([PHP_HTTP_HAVE_SERF], [0], [ ])
-dnl		else
-dnl			AC_MSG_RESULT([found in $SERF_DIR])
-
-dnl			PHP_ADD_INCLUDE($SERF_DIR/include/serf-$SERF_VER)
-dnl			PHP_ADD_LIBRARY_WITH_PATH(serf-$SERF_VER, $SERF_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
-dnl			AC_DEFINE([PHP_HTTP_HAVE_SERF], [1], [Have libserf support])
-dnl			HTTP_HAVE_A_REQUEST_LIB=true
-dnl		fi
-dnl	fi
-dnl	
-
 dnl ----
 dnl CURL
 dnl ----
@@ -339,7 +307,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.h | $AWK '{print $3}'`"
+					EVENT_VER="`$EGREP _EVENT_VERSION $EVENT_DIR/include/event2/event-config.h | $AWK '{print $3}'`"
 					AC_DEFINE([PHP_HTTP_HAVE_EVENT2], [1], [ ])
 				else
 					AC_DEFINE([PHP_HTTP_HAVE_EVENT2], [0], [ ])
@@ -381,7 +349,7 @@ dnl ----
 			fi
 		done
 		if test "x$HTTP_EXT_RAPHF_INCDIR" = "x"; then
-			AC_MSG_FAILURE([not found])
+			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])
@@ -389,6 +357,32 @@ dnl ----
 		fi
 	])
 
+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
+	])
+
 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)
@@ -436,13 +430,7 @@ dnl ----
 		php_http_buffer.c \
 		php_http.c \
 		php_http_client.c \
-		php_http_curl_client.c \
-		php_http_client_datashare.c \
-		php_http_curl_client_datashare.c \
-		php_http_client_factory.c \
-		php_http_client_interface.c \
-		php_http_client_pool.c \
-		php_http_curl_client_pool.c \
+		php_http_client_curl.c \
 		php_http_client_request.c \
 		php_http_client_response.c \
 		php_http_cookie.c \
@@ -465,7 +453,6 @@ dnl ----
 		php_http_object.c \
 		php_http_options.c \
 		php_http_params.c \
-		php_http_property_proxy.c \
 		php_http_querystring.c \
 		php_http_strlist.c \
 		php_http_url.c \
@@ -478,6 +465,10 @@ dnl ----
 	HTTP_SHARED_DEP([iconv])
 	HTTP_SHARED_DEP([json])
 	
+	dnl extension deps
+	PHP_ADD_EXTENSION_DEP([http], [raphf], true)
+	PHP_ADD_EXTENSION_DEP([http], [propo], true)
+	
 	PHP_SUBST([HTTP_SHARED_LIBADD])
 
 	PHP_HTTP_HEADERS="
@@ -514,7 +505,6 @@ dnl ----
 		php_http_object.h \
 		php_http_options.h \
 		php_http_params.h \
-		php_http_property_proxy.h \
 		php_http_querystring.h \
 		php_http_strlist.h \
 		php_http_url.h \