X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config9.m4;h=63062de8e5d048a045c584fad338e7bd3d8fd4b6;hp=d6f2446fd5b461b8a672c90baaef82c7b54a7831;hb=305ac2f007710b684d96b05f33964b4f6a4e3e4d;hpb=707ee66a824e2bb5daad723f75682aea777b09a3

diff --git a/config9.m4 b/config9.m4
index d6f2446..63062de 100644
--- a/config9.m4
+++ b/config9.m4
@@ -8,8 +8,6 @@ PHP_ARG_WITH([http-zlib-dir], [],
 [  --with-http-zlib-dir[=DIR]     HTTP: where to find zlib], $PHP_HTTP, $PHP_HTTP)
 PHP_ARG_WITH([http-libcurl-dir], [],
 [  --with-http-libcurl-dir[=DIR]  HTTP: where to find libcurl], $PHP_HTTP, $PHP_HTTP)
-PHP_ARG_WITH([http-libserf-dir], [],
-[  --with-http-libserf-dir[=DIR]  HTTP: where to find libserf], $PHP_HTTP, $PHP_HTTP)
 PHP_ARG_WITH([http-libevent-dir], [],
 [  --with-http-libevent-dir[=DIR] HTTP: where to find libevent], $PHP_HTTP_LIBCURL_DIR, "")
 
@@ -243,6 +241,7 @@ dnl ----
 					AC_MSG_RESULT([yes])
 					AC_CHECK_HEADER([openssl/crypto.h], [
 						AC_DEFINE([PHP_HTTP_HAVE_OPENSSL], [1], [ ])
+						CURL_SSL="crypto"
 					])
 				], [
 					AC_MSG_RESULT([no])
@@ -266,6 +265,7 @@ dnl ----
 					AC_MSG_RESULT([yes])
 					AC_CHECK_HEADER([gcrypt.h], [
 						AC_DEFINE([PHP_HTTP_HAVE_GNUTLS], [1], [ ])
+						CURL_SSL="gcrypt"
 					])
 				], [
 					AC_MSG_RESULT([no])
@@ -301,6 +301,9 @@ dnl ----
 			PHP_ADD_INCLUDE($CURL_DIR/include)
 			PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
 			PHP_EVAL_LIBLINE(`$CURL_CONFIG --libs`, HTTP_SHARED_LIBADD)
+			if test "x$CURL_SSL" != "x"; then
+				PHP_ADD_LIBRARY_WITH_PATH([$CURL_SSL], $CURL_DIR/$PHP_LIBDIR, PHP_HTTP_SHARED_LIBADD)
+			fi
 			AC_DEFINE([PHP_HTTP_HAVE_CURL], [1], [Have libcurl support])
 			HTTP_HAVE_A_REQUEST_LIB=true
 		fi
@@ -380,6 +383,12 @@ dnl ----
 		fi
 	])
 
+dnl ----
+dnl JSON
+dnl ----
+	HTTP_HAVE_PHP_EXT([json])
+
+
 dnl ----
 dnl ICONV
 dnl ----
@@ -389,17 +398,29 @@ dnl ----
 dnl DONE
 dnl ----
 	PHP_HTTP_SOURCES="\
-		php_http.c \
 		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_request.c \
+		php_http_client_response.c \
 		php_http_cookie.c \
+		php_http_curl.c \
 		php_http_encoding.c \
 		php_http_env.c \
+		php_http_env_request.c \
 		php_http_env_response.c \
 		php_http_etag.c \
 		php_http_exception.c \
 		php_http_filter.c \
-		php_http_headers.c \
 		php_http_header_parser.c \
+		php_http_headers.c \
 		php_http_info.c \
 		php_http_message_body.c \
 		php_http_message.c \
@@ -408,16 +429,10 @@ dnl ----
 		php_http_negotiate.c \
 		php_http_object.c \
 		php_http_params.c \
-		php_http_resource_factory.c \
 		php_http_persistent_handle.c \
 		php_http_property_proxy.c \
 		php_http_querystring.c \
-		php_http_request.c \
-		php_http_request_factory.c \
-		php_http_curl.c \
-		php_http_request_pool.c \
-		php_http_request_datashare.c \
-		php_http_request_method.c \
+		php_http_resource_factory.c \
 		php_http_strlist.c \
 		php_http_url.c \
 		php_http_version.c \
@@ -427,21 +442,35 @@ 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.h \
+		php_http_api.h \
 		php_http_buffer.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_curl_client_pool.h \
+		php_http_client_pool.h \
+		php_http_client_request.h \
+		php_http_client_response.h \
 		php_http_cookie.h \
+		php_http_curl.h \
 		php_http_encoding.h \
 		php_http_env.h \
+		php_http_env_request.h \
 		php_http_env_response.h \
 		php_http_etag.h \
 		php_http_exception.h \
 		php_http_filter.h \
-		php_http_headers.h \
+		php_http.h \
 		php_http_header_parser.h \
+		php_http_headers.h \
 		php_http_info.h \
 		php_http_message_body.h \
 		php_http_message.h \
@@ -450,16 +479,10 @@ dnl ----
 		php_http_negotiate.h \
 		php_http_object.h \
 		php_http_params.h \
-		php_http_resource_factory.h \
 		php_http_persistent_handle.h \
 		php_http_property_proxy.h \
 		php_http_querystring.h \
-		php_http_request_datashare.h \
-		php_http_request.h \
-		php_http_request_factory.h \
-		php_http_curl.h \
-		php_http_request_method.h \
-		php_http_request_pool.h \
+		php_http_resource_factory.h \
 		php_http_strlist.h \
 		php_http_url.h \
 		php_http_version.h \