X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config.m4;h=29f1698f4e8408ca69bea06f5b379f16bc8b5976;hp=7b048bc63458320efb8ab21940b56b19b3917b86;hb=61ced187b8a3a3c21578d253e37d1a076aa0aed4;hpb=a673ef718611fe1a7c8a4c61b2f4c97fc06efc2d

diff --git a/config.m4 b/config.m4
index 7b048bc..29f1698 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)
@@ -140,13 +146,19 @@ dnl ----
 	PHP_NEW_EXTENSION([http], $PHP_HTTP_SOURCES, [$ext_shared])
 	PHP_ADD_BUILD_DIR($ext_builddir/phpstr, 1)
 	PHP_SUBST([HTTP_SHARED_LIBADD])
-	PHP_ADD_MAKEFILE_FRAGMENT
-	AC_DEFINE([HAVE_HTTP], [1], [Have extended HTTP support])
 
-dnl ---
-dnl odd warnings
-dnl ---
-dnl		CFLAGS=" -g -O2 -W -Wchar-subscripts -Wformat=2 -Wno-format-y2k -Wimplicit -Wmissing-braces -Wunused-variable -Wbad-function-cast -Wpointer-arith -Wsign-compare -Winline"
-dnl		PHP_SUBST([CFLAGS])
+	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/phpstr, [phpstr/phpstr.h])
+	], [
+		PHP_ADD_MAKEFILE_FRAGMENT
+	])
+
+	AC_DEFINE([HAVE_HTTP], [1], [Have extended HTTP support])
 fi