X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config.m4;h=7582cd9d76d1b446d2f15e3579335834d4fa83d7;hp=aac5a5462670a07da1ccbae5454dd807aad9c8b3;hb=8d25696948ed61d50c417275222117f43069ddd1;hpb=f6a58b4f97105ba3c3177116c18672f1b8ba4179

diff --git a/config.m4 b/config.m4
index aac5a54..7582cd9 100644
--- a/config.m4
+++ b/config.m4
@@ -12,7 +12,7 @@ PHP_ARG_WITH([http-mhash-etags], [whether to enable mhash ETag generator],
 PHP_ARG_WITH([http-magic-mime], [whether to enable response content type guessing],
 [  --with-http-magic-mime[=MAGICDIR]
                            With magic mime response content type guessing])
-PHP_ARG_WITH([http-zlib-compression], [whether to enable support for gzencoded/deflated message bodies])
+PHP_ARG_WITH([http-zlib-compression], [whether to enable support for gzencoded/deflated message bodies],
 [  --with-http-zlib-compression[=ZLIBDIR]
                            With zlib gzdecode and inflate support])
 
@@ -21,32 +21,26 @@ if test "$PHP_HTTP" != "no"; then
 dnl -------
 dnl NETDB.H
 dnl -------
-	AC_MSG_CHECKING(for netdb.h)
-	if test -r /usr/include/netdb.h -o -r /usr/local/include/netdb.h; then
-		AC_DEFINE(HAVE_NETDB_H, 1, [Have netdb.h])
-		AC_MSG_RESULT(found in default path)
-	else
-		AC_MSG_RESULT(not found in default path)
-	fi
+	AC_CHECK_HEADERS([netdb.h])
 
 dnl ----
 dnl ZLIB
 dnl ----
 	AC_MSG_CHECKING([for zlib.h])
 	ZLIB_DIR=
-	for i int "$PHP_HTTP_ZLIB_COMPRESSION" "$PHP_ZLIB_DIR" "$PHP_ZLIB" /user/local /usr /opt; do
-		if test -r "$i/include/zlib.h"; then
+	for i in "$PHP_HTTP_ZLIB_COMPRESSION" "$PHP_ZLIB_DIR" "$PHP_ZLIB" /user/local /usr /opt; do
+		if test -f "$i/include/zlib.h"; then
 			ZLIB_DIR=$i
 			break;
 		fi
 	done
 	if test -z "$ZLIB_DIR"; then
 		AC_MSG_RESULT([not found])
-		AC_MSG_WARNING([zlib support not enabled; zlib.h not found])
+		AC_MSG_WARN([gzip support not enabled; zlib.h not found])
 	else
 		AC_MSG_RESULT([found in $ZLIB_DIR])
 		PHP_ADD_INCLUDE($ZLIB_DIR/include)
-		PHP_ADD_LIBRARY_WITH_PATH(libz, $ZLIB_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
+		PHP_ADD_LIBRARY_WITH_PATH(z, $ZLIB_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
 		AC_DEFINE([HTTP_HAVE_ZLIB], [1], [Have zlib support])
 	fi
 	
@@ -58,7 +52,7 @@ dnl ----
 		AC_MSG_CHECKING([for curl/curl.h])
 		CURL_DIR=
 		for i in "$PHP_HTTP_CURL_REQUESTS" /usr/local /usr /opt; do
-			if test -r "$i/include/curl/curl.h"; then
+			if test -f "$i/include/curl/curl.h"; then
 				CURL_DIR=$i
 				break
 			fi
@@ -85,13 +79,39 @@ dnl ----
 			AC_MSG_RESULT([found: $CURL_CONFIG])
 		fi
 		
+		CURL_LIBS=`$CURL_CONFIG --libs`
+		
+		AC_MSG_CHECKING([for SSL support in libcurl])
 		CURL_SSL=`$CURL_CONFIG --features | $EGREP SSL`
 		if test "$CURL_SSL" == "SSL"; then
+			AC_MSG_RESULT([yes])
 			AC_DEFINE([HTTP_HAVE_SSL], [1], [ ])
+			
+			AC_MSG_CHECKING([for SSL library used])
+			CURL_SSL_FLAVOUR=
+			for i in $CURL_LIBS; do
+				if test "$i" == "-lssl"; then
+					CURL_SSL_FLAVOUR="openssl"
+					AC_MSG_RESULT([openssl])
+					AC_DEFINE([HTTP_HAVE_OPENSSL], [1], [ ])
+					AC_CHECK_HEADERS([openssl/crypto.h])
+					break
+				elif test "$i" == "-lgnutls"; then
+					CURL_SSL_FLAVOUR="gnutls"
+					AC_MSG_RESULT([gnutls])
+					AC_DEFINE([HTTP_HAVE_GNUTLS], [1], [ ])
+					AC_CHECK_HEADERS([gcrypt.h])
+					break
+				fi
+			done
+			if test -z "$CURL_SSL_FLAVOUR"; then
+				AC_MSG_RESULT([unknown!])
+				AC_MSG_WARN([Could not determine the type of SSL library used!])
+				AC_MSG_WARN([Building will fail in ZTS mode!])
+			fi
+		else
+			AC_MSG_RESULT([no])
 		fi
-		AC_CHECK_HEADERS([openssl/crypto.h])
-		
-		CURL_LIBS=`$CURL_CONFIG --libs`
 		
 		PHP_ADD_INCLUDE($CURL_DIR/include)
 		PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
@@ -171,7 +191,7 @@ dnl ----
 		http_api.c http_cache_api.c http_request_api.c http_date_api.c \
 		http_headers_api.c http_message_api.c http_send_api.c http_url_api.c \
 		http_info_api.c http_request_method_api.c http_encoding_api.c"
-	PHP_NEW_EXTENSION([http], $PHP_HTTP_SOURCES, [$ext_shared])
+	PHP_NEW_EXTENSION([http], $PHP_HTTP_SOURCES, $ext_shared)
 	PHP_ADD_BUILD_DIR($ext_builddir/phpstr, 1)
 	PHP_SUBST([HTTP_SHARED_LIBADD])