X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=config9.m4;h=ea6c692a3f2ae2e9d001f89301517fc8f454d990;hb=40688e36ecfc7b22a1221079a8d40edd122ee550;hp=f84266f0666b4991f67ef42acfb96301bf4f16e0;hpb=5946b5b8a86f299bb3b37e3a60d9173ad655b3f9;p=m6w6%2Fext-http

diff --git a/config9.m4 b/config9.m4
index f84266f..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], [ ])
@@ -462,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 \
@@ -503,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="