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

diff --git a/config9.m4 b/config9.m4
index d6f2446..2a03cef 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
@@ -394,6 +397,7 @@ dnl ----
 		php_http_cookie.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 \
@@ -432,10 +436,12 @@ dnl ----
 
 	PHP_HTTP_HEADERS="
 		php_http.h \
+		php_http_api.h \
 		php_http_buffer.h \
 		php_http_cookie.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 \