X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config9.m4;h=e6924ace3909b11f621ecd1062a8bceecdcf450a;hp=9cce66ba2933477a9bfcbb8355a157aa76a73bb2;hb=dada371ebca4e4015b00067254fad1d7c2f06d2f;hpb=a18e662d5ff2c4e7051e028f8002dbba720cccd6

diff --git a/config9.m4 b/config9.m4
index 9cce66b..e6924ac 100644
--- a/config9.m4
+++ b/config9.m4
@@ -320,7 +320,7 @@ dnl ----
 			AC_MSG_WARN([event support is incompatible with pecl/event; continuing without libevent support])
 			AC_DEFINE([PHP_HTTP_HAVE_EVENT], [0], [ ])
 		], [
-			AC_MSG_CHECKING([for event.h])
+			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
@@ -336,12 +336,20 @@ dnl ----
 				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"
+				
+				if test -f "$EVENT_DIR/include/event2/event.h"; then
+					EVENT_VER="`$EGREP _EVENT_VERSION $EVENT_DIR/include/event2/event.h | $AWK '{print $3}'`"
+					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.2 or greater"
+						EVENT_VER="1.1b or lower"
 					fi
 				fi
 				AC_DEFINE_UNQUOTED([PHP_HTTP_EVENT_VERSION], ["$EVENT_VER"], [ ])
@@ -356,7 +364,7 @@ dnl ----
 
 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're built shared)], $PHP_HTTP, $PHP_HTTP)
+                                     and iconv (when they are built shared)], $PHP_HTTP, $PHP_HTTP)
 dnl ----
 dnl HASH
 dnl ----
@@ -383,6 +391,12 @@ dnl ----
 		fi
 	])
 
+dnl ----
+dnl JSON
+dnl ----
+	HTTP_HAVE_PHP_EXT([json])
+
+
 dnl ----
 dnl ICONV
 dnl ----
@@ -395,13 +409,13 @@ dnl ----
 		php_http_buffer.c \
 		php_http.c \
 		php_http_client.c \
-		php_http_client_curl.c \
+		php_http_curl_client.c \
 		php_http_client_datashare.c \
-		php_http_client_datashare_curl.c \
+		php_http_curl_client_datashare.c \
 		php_http_client_factory.c \
 		php_http_client_interface.c \
 		php_http_client_pool.c \
-		php_http_client_pool_curl.c \
+		php_http_curl_client_pool.c \
 		php_http_client_request.c \
 		php_http_client_response.c \
 		php_http_cookie.c \
@@ -422,6 +436,7 @@ dnl ----
 		php_http_misc.c \
 		php_http_negotiate.c \
 		php_http_object.c \
+		php_http_options.c \
 		php_http_params.c \
 		php_http_persistent_handle.c \
 		php_http_property_proxy.c \
@@ -436,19 +451,20 @@ dnl ----
 	dnl shared extension deps
 	HTTP_SHARED_DEP([hash])
 	HTTP_SHARED_DEP([iconv])
+	HTTP_SHARED_DEP([json])
 	
 	PHP_SUBST([HTTP_SHARED_LIBADD])
 
 	PHP_HTTP_HEADERS="
 		php_http_api.h \
 		php_http_buffer.h \
-		php_http_client_curl.h \
-		php_http_client_datashare_curl.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_client_pool_curl.h \
+		php_http_curl_client_pool.h \
 		php_http_client_pool.h \
 		php_http_client_request.h \
 		php_http_client_response.h \
@@ -471,6 +487,7 @@ dnl ----
 		php_http_misc.h \
 		php_http_negotiate.h \
 		php_http_object.h \
+		php_http_options.h \
 		php_http_params.h \
 		php_http_persistent_handle.h \
 		php_http_property_proxy.h \