X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config9.m4;h=a832b1c65fe4abdb4f8500b9da085e2adcd9816f;hp=3712b31236acc66874aa2bc1c4b7dfae22d67935;hb=b7afdab5771258952d6ea517332c49e02769b2d9;hpb=5301527d060a7bed536005e10339bc53fe486303

diff --git a/config9.m4 b/config9.m4
index 3712b31..a832b1c 100644
--- a/config9.m4
+++ b/config9.m4
@@ -38,6 +38,8 @@ if test "$PHP_HTTP" != "no"; then
 		])
 	])
 	
+	AC_PROG_CPP
+	
 	if test "$PHP_HTTP_SHARED_DEPS" != "no"; then
 		AC_DEFINE([HTTP_SHARED_DEPS], [1], [ ])
 	else
@@ -178,73 +180,81 @@ dnl ----
 			AC_MSG_ERROR([libcurl version greater or equal to 7.12.3 required])
 		fi
 		
+		dnl
+		dnl compile tests
+		dnl
+		
+		save_INCLUDES="$INCLUDES"
+		INCLUDES=
+		save_LIBS="$LIBS"
+		LIBS=
+		save_CFLAGS="$CFLAGS"
+		CFLAGS="`$CURL_CONFIG --cflags`"
+		save_LDFLAGS="$LDFLAGS"
+		LDFLAGS="`$CURL_CONFIG --libs` $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR"
+		
 		AC_MSG_CHECKING([for SSL support in libcurl])
 		CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
 		if test "$CURL_SSL" = "SSL"; then
 			AC_MSG_RESULT([yes])
 			AC_DEFINE([HTTP_HAVE_SSL], [1], [ ])
 			
-			save_CFLAGS="$CFLAGS"
-			CFLAGS="`$CURL_CONFIG --cflags`"
-			save_LDFLAGS="$LDFALGS"
-			LDFLAGS="`$CURL_CONFIG --libs` $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR"
-			
-			AC_CHECK_HEADER([openssl/crypto.h], [
-				AC_MSG_CHECKING([for openssl support in libcurl])
-				AC_TRY_RUN([
-					#include <curl/curl.h>
-					int main(int argc, char *argv[]) {
-						curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
-						if (data) {
-							if (data->ssl_version && *data->ssl_version) {
-								const char *ptr = data->ssl_version;
-								while(*ptr == ' ') ++ptr;
-								return strncasecmp(ptr, "OpenSSL", sizeof("OpenSSL")-1);
-							}
-						}
-						return 1;
+			AC_MSG_CHECKING([for openssl support in libcurl])
+			AC_TRY_RUN([
+				#include <curl/curl.h>
+				int main(int argc, char *argv[]) {
+					curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
+					if (data && data->ssl_version && *data->ssl_version) {
+						const char *ptr = data->ssl_version;
+						while(*ptr == ' ') ++ptr;
+						return strncasecmp(ptr, "OpenSSL", sizeof("OpenSSL")-1);
 					}
-				],[
-					AC_MSG_RESULT([yes])
+					return 1;
+				}
+			], [
+				AC_MSG_RESULT([yes])
+				AC_CHECK_HEADER([openssl/crypto.h], [
 					AC_DEFINE([HTTP_HAVE_OPENSSL], [1], [ ])
-				], [
-					AC_MSG_RESULT([no])
-				], [
-					AC_MSG_RESULT([no])
 				])
+			], [
+				AC_MSG_RESULT([no])
+			], [
+				AC_MSG_RESULT([no])
 			])
 			
-			AC_CHECK_HEADER([gcrypt.h], [
-				AC_MSG_CHECKING([for gnutls support in libcurl])
-				AC_TRY_RUN([
-					#include <curl/curl.h>
-					int main(int argc, char *argv[]) {
-						curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
-						if (data) {
-							if (data->ssl_version && *data->ssl_version) {
-								const char *ptr = data->ssl_version;
-								while(*ptr == ' ') ++ptr;
-								return strncasecmp(ptr, "GnuTLS", sizeof("GnuTLS")-1);
-							}
-						}
-						return 1;
+			AC_MSG_CHECKING([for gnutls support in libcurl])
+			AC_TRY_RUN([
+				#include <curl/curl.h>
+				int main(int argc, char *argv[]) {
+					curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
+					if (data && data->ssl_version && *data->ssl_version) {
+						const char *ptr = data->ssl_version;
+						while(*ptr == ' ') ++ptr;
+						return strncasecmp(ptr, "GnuTLS", sizeof("GnuTLS")-1);
 					}
-				], [
-					AC_MSG_RESULT([yes])
+					return 1;
+				}
+			], [
+				AC_MSG_RESULT([yes])
+				AC_CHECK_HEADER([gcrypt.h], [
 					AC_DEFINE([HTTP_HAVE_GNUTLS], [1], [ ])
-				], [
-					AC_MSG_RESULT([no])
-				], [
-					AC_MSG_RESULT([no])
 				])
+			], [
+				AC_MSG_RESULT([no])
+			], [
+				AC_MSG_RESULT([no])
 			])
-			
-			CFLAGS="$save_CFLAGS"
-			LDFLAGS="$save_LDFLAGS"
 		else
 			AC_MSG_RESULT([no])
 		fi
 		
+		INCLUDES="$save_INCLUDES"
+		LIBS="$save_LIBS"
+		CFLAGS="$save_CFLAGS"
+		LDFLAGS="$save_LDFLAGS"
+		
+		dnl end compile tests
+		
 		AC_MSG_CHECKING([for bundled SSL CA info])
 		CURL_CAINFO=
 		for i in `$CURL_CONFIG --ca` "/etc/ssl/certs/ca-certificates.crt"; do
@@ -281,12 +291,6 @@ dnl ----
 			[AC_DEFINE([HAVE_CURL_EASY_RESET], [1], [ ])], [ ],
 			[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
 		)
-		dnl Debian suddenly (>=7.14.1-2) hides all symbols not starting with "curl"
-		PHP_CHECK_LIBRARY(curl, Curl_getFormData,
-			[AC_DEFINE([HAVE_CURL_GETFORMDATA], [1], [ ])], [ ],
-			[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
-		)
-		dnl New API function which obsoletes use of Curl_getFormData (>=7.15.5)
 		PHP_CHECK_LIBRARY(curl, curl_formget,
 			[AC_DEFINE([HAVE_CURL_FORMGET], [1], [ ])], [ ],
 			[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]