X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config.m4;h=cb340f52f45f41654a6e2193c785c714c0065921;hp=e28a1dfe96e7fc1b46e20c8e9830fe2588c76969;hb=e16550c0f9e13089c70aa1944d1a588f61fa81d2;hpb=d83edb65a0097de2d5baa1a9fd9dbcebed34cc79

diff --git a/config.m4 b/config.m4
index e28a1df..cb340f5 100644
--- a/config.m4
+++ b/config.m4
@@ -61,6 +61,12 @@ dnl ----
 			AC_MSG_RESULT([found: $CURL_CONFIG])
 		fi
 		
+		CURL_SSL=`$CURL_CONFIG --features | $EGREP SSL`
+		if test "$CURL_SSL" == "SSL"; then
+			AC_DEFINE([HTTP_HAVE_SSL], [1], [ ])
+		fi
+		AC_CHECK_HEADERS([openssl/crypto.h])
+		
 		CURL_LIBS=`$CURL_CONFIG --libs`
 		
 		PHP_ADD_INCLUDE($CURL_DIR/include)
@@ -76,6 +82,10 @@ dnl ----
 			[AC_DEFINE([HAVE_CURL_EASY_STRERROR], [1], [ ])], [ ],
 			[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
 		)
+		PHP_CHECK_LIBRARY(curl, curl_easy_reset,
+			[AC_DEFINE([HAVE_CURL_EASY_RESET], [1], [ ])], [ ],
+			[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
+		)
 	fi
 
 dnl ----
@@ -141,25 +151,15 @@ dnl ----
 	PHP_ADD_BUILD_DIR($ext_builddir/phpstr, 1)
 	PHP_SUBST([HTTP_SHARED_LIBADD])
 
-	HTTP_HEADER_FILES= \
-		phpstr/phpstr.h \
-		php_http_std_defs.h \
-		php_http.h \
-		php_http_api.h \
-		php_http_cache_api.h \
-		php_http_date_api.h \
-		php_http_headers_api.h \
-		php_http_info_api.h \
-		php_http_message_api.h \
-		php_http_request_api.h \
-		php_http_request_method_api.h \
-		php_http_send_api.h \
-		php_http_url_api.h
+	HTTP_HEADER_FILES="php_http_std_defs.h php_http.h php_http_api.h php_http_cache_api.h \
+		php_http_date_api.h php_http_headers_api.h php_http_info_api.h php_http_message_api.h \
+		php_http_request_api.h php_http_request_method_api.h php_http_send_api.h php_http_url_api.h"
 	PHP_SUBST([HTTP_HEADER_FILES])
 
 	ifdef([PHP_INSTALL_HEADERS],
 	[
-		PHP_INSTALL_HEADERS(ext/http, [HTTP_HEADER_FILES])
+		PHP_INSTALL_HEADERS(ext/http, $HTTP_HEADER_FILES)
+		PHP_INSTALL_HEADERS(ext/http/phpstr, [phpstr/phpstr.h])
 	], [
 		PHP_ADD_MAKEFILE_FRAGMENT
 	])