X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config9.m4;h=2979106c3a2b7692de50f2eabaa71b87f1ad14b1;hp=2351eb59362cdcff6be7d2cd2078ef54c1d5c265;hb=2a501676c41f8b78392fdf4cd33e9eeaf46736f4;hpb=c3200376cd66459d40a1a520074119713c9c8dff

diff --git a/config9.m4 b/config9.m4
index 2351eb5..2979106 100644
--- a/config9.m4
+++ b/config9.m4
@@ -132,36 +132,37 @@ dnl ----
 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
 
-	if test "$PHP_HTTP_LIBSERF_DIR" = "no"; then
-		AC_DEFINE([PHP_HTTP_HAVE_SERF], [0], [ ])
-	else
-		AC_MSG_CHECKING([for serf-?/serf.h])
-		SERF_DIR=
-		for i in "$PHP_HTTP_LIBSERF_DIR" /usr/local /usr /opt; do
-			if test -f "$i/include/serf-0/serf.h"; then
-				SERF_DIR=$i
-				SERF_VER=0
-				break
-			elif test -f "$i/include/serf-1/serf.h"; then
-				SERF_DIR=$i
-				SERF_VER=1
-			fi
-		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])
 
-		if test "x$SERF_DIR" = "x"; then
-			AC_MSG_RESULT([not found])
-			AC_DEFINE([PHP_HTTP_HAVE_SERF], [0], [ ])
-		else
-			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	
 
-			PHP_ADD_INCLUDE($SERF_DIR/include/serf-$SERF_VER)
-			PHP_ADD_LIBRARY_WITH_PATH(serf-$SERF_VER, $SERF_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
-			AC_DEFINE([PHP_HTTP_HAVE_SERF], [1], [Have libserf support])
-			HTTP_HAVE_A_REQUEST_LIB=true
-		fi
-	fi
-	
 dnl ----
 dnl CURL
 dnl ----
@@ -320,7 +321,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 +337,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"], [ ])
@@ -428,6 +437,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 \
@@ -478,6 +488,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 \