X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config9.m4;h=e5dd56602dca5b0435d5417ad0206add9f8d4445;hp=c11d6c0640131d7fcf981f2dc5dd09b99ce7ddad;hb=ad5f896b03adaa073134a00108a9cdf00720673a;hpb=0a35a30bb5fcb9342af1839d48eee317efcff726

diff --git a/config9.m4 b/config9.m4
index c11d6c0..e5dd566 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
@@ -73,11 +75,11 @@ if test "$PHP_HTTP" != "no"; then
 	AC_DEFUN([HTTP_HAVE_PHP_EXT], [
 		extname=$1
 		haveext=$[PHP_]translit($1,a-z_-,A-Z__)
-		ishared=$[PHP_]translit($1,a-z_-,A-Z__)_SHARED
 		
 		AC_MSG_CHECKING([for ext/$extname support])
 		if test -x "$PHP_EXECUTABLE"; then
-			if test "`$PHP_EXECUTABLE -m | $EGREP ^$extname\$`" = "$extname"; then
+			grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$`
+			if test "$grepext" = "$extname"; then
 				[HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)=1
 				AC_MSG_RESULT([yes])
 				$2
@@ -96,6 +98,13 @@ if test "$PHP_HTTP" != "no"; then
 			$3
 		fi
 	])
+	
+	dnl
+	dnl odd PHP4 fix
+	dnl
+	if test "x$PHP_LIBDIR" = "x"; then
+		PHP_LIBDIR=lib
+	fi
 
 dnl ----
 dnl STDC
@@ -118,7 +127,7 @@ dnl ----
 				break;
 			fi
 		done
-		if test -z "$ZLIB_DIR"; then
+		if test "x$ZLIB_DIR" = "x"; then
 			AC_MSG_RESULT([not found])
 			AC_MSG_ERROR([could not find zlib.h])
 		else
@@ -148,7 +157,7 @@ dnl ----
 				break
 			fi
 		done
-		if test -z "$CURL_DIR"; then
+		if test "x$CURL_DIR" = "x"; then
 			AC_MSG_RESULT([not found])
 			AC_MSG_ERROR([could not find curl/curl.h])
 		else
@@ -163,7 +172,7 @@ dnl ----
 				break
 			fi
 		done
-		if test -z "$CURL_CONFIG"; then
+		if test "x$CURL_CONFIG" = "x"; then
 			AC_MSG_RESULT([not found])
 			AC_MSG_ERROR([could not find curl-config])
 		else
@@ -178,7 +187,19 @@ dnl ----
 			AC_MSG_ERROR([libcurl version greater or equal to 7.12.3 required])
 		fi
 		
-		CURL_LIBS=`$CURL_CONFIG --libs`
+		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`
+		LDFLAGS="$LDFLAGS $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR"
 		
 		AC_MSG_CHECKING([for SSL support in libcurl])
 		CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
@@ -186,35 +207,62 @@ dnl ----
 			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
-				case $i in
-					-lssl* | -lyassl*)
-						CURL_SSL_FLAVOUR="openssl"
-						AC_MSG_RESULT([openssl])
-						AC_DEFINE([HTTP_HAVE_OPENSSL], [1], [ ])
-						AC_CHECK_HEADERS([openssl/crypto.h])
-						break
-					;;
-					-lgnutls*)
-						CURL_SSL_FLAVOUR="gnutls"
-						AC_MSG_RESULT([gnutls])
-						AC_DEFINE([HTTP_HAVE_GNUTLS], [1], [ ])
-						AC_CHECK_HEADERS([gcrypt.h])
-						break
-					;;
-				esac
-			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
+			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);
+					}
+					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_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);
+					}
+					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])
+			])
 		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
@@ -223,7 +271,7 @@ dnl ----
 				break
 			fi
 		done
-		if test -z "$CURL_CAINFO"; then
+		if test "x$CURL_CAINFO" = "x"; then
 			AC_MSG_RESULT([not found])
 		else
 			AC_MSG_RESULT([$CURL_CAINFO])
@@ -232,7 +280,7 @@ dnl ----
 		
 		PHP_ADD_INCLUDE($CURL_DIR/include)
 		PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
-		PHP_EVAL_LIBLINE($CURL_LIBS, HTTP_SHARED_LIBADD)
+		PHP_EVAL_LIBLINE(`$CURL_CONFIG --libs`, HTTP_SHARED_LIBADD)
 		AC_DEFINE([HTTP_HAVE_CURL], [1], [Have cURL support])
 		
 		PHP_CHECK_LIBRARY(curl, curl_share_strerror, 
@@ -251,12 +299,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]
@@ -275,33 +317,50 @@ dnl ----
 		dnl ----
 		
 		if test "$PHP_HTTP_CURL_LIBEVENT" != "no"; then
-			AC_MSG_CHECKING([for event.h])
-			EVENT_DIR=
-			for i in "$PHP_HTTP_LIBEVENT_DIR" /usr/local /usr /opt; do
-				if test -f "$i/include/event.h"; then
-					EVENT_DIR=$i
-					break
-				fi
-			done
-			if test -z "$EVENT_DIR"; then
-				AC_MSG_RESULT([not found])
-				AC_MSG_WARN([continuing without libevent support])
-			else
-				AC_MSG_RESULT([found in $EVENT_DIR])
-				AC_MSG_CHECKING([for libcurl version >= 7.16.0])
-				AC_MSG_RESULT([$CURL_VERSION])
-				if test `echo $CURL_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71600; then
-					AC_MSG_WARN([libcurl version greater or equal to 7.16.0 required; continuing without libevent support])
+			HTTP_HAVE_PHP_EXT([event], [
+				AC_MSG_WARN([event support is incompatible with pecl/event; continuing without libevent support])
+			], [
+				AC_MSG_CHECKING([for event.h])
+				EVENT_DIR=
+				for i in "$PHP_HTTP_CURL_LIBEVENT" /usr/local /usr /opt; do
+					if test -f "$i/include/event.h"; then
+						EVENT_DIR=$i
+						break
+					fi
+				done
+				if test "x$EVENT_DIR" = "x"; then
+					AC_MSG_RESULT([not found])
+					AC_MSG_WARN([continuing without libevent support])
 				else
-					PHP_ADD_INCLUDE($EVENT_DIR/include)
-					PHP_ADD_LIBRARY_WITH_PATH(event, $EVENT_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
-					AC_DEFINE([HTTP_HAVE_EVENT], [1], [Have libevent support for cURL])
-					PHP_CHECK_LIBRARY(curl, curl_multi_socket_action, 
-						[AC_DEFINE([HAVE_CURL_MULTI_SOCKET_ACTION], [1], [ ])], [ ],
-						[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
-					)
+					AC_MSG_RESULT([found in $EVENT_DIR])
+					
+					AC_MSG_CHECKING([for libevent version, roughly])
+					EVENT_VER="1.1b or lower"
+					if test -f "$EVENT_DIR/include/evhttp.h" && test -f "$EVENT_DIR/include/evdns.h"; then
+						if test -f "$EVENT_DIR/include/evrpc.h"; then
+							EVENT_VER="1.4 or greater"
+						else
+							EVENT_VER="1.2 or greater"
+						fi
+					fi
+					AC_DEFINE_UNQUOTED([HTTP_EVENT_VERSION], ["$EVENT_VER"], [ ])
+					AC_MSG_RESULT([$EVENT_VER])
+					
+					AC_MSG_CHECKING([for libcurl version >= 7.16.0])
+					AC_MSG_RESULT([$CURL_VERSION])
+					if test `echo $CURL_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71600; then
+						AC_MSG_WARN([libcurl version greater or equal to 7.16.0 required; continuing without libevent support])
+					else
+						PHP_ADD_INCLUDE($EVENT_DIR/include)
+						PHP_ADD_LIBRARY_WITH_PATH(event, $EVENT_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
+						AC_DEFINE([HTTP_HAVE_EVENT], [1], [Have libevent support for cURL])
+						PHP_CHECK_LIBRARY(curl, curl_multi_socket_action, 
+							[AC_DEFINE([HAVE_CURL_MULTI_SOCKET_ACTION], [1], [ ])], [ ],
+							[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
+						)
+					fi
 				fi
-			fi
+			])
 		fi
 	fi
 
@@ -317,7 +376,7 @@ dnl ----
 				break
 			fi
 		done
-		if test -z "$MAGIC_DIR"; then
+		if test "x$MAGIC_DIR" = "x"; then
 			AC_MSG_RESULT([not found])
 			AC_MSG_ERROR([could not find magic.h])
 		else
@@ -346,7 +405,7 @@ dnl ----
 				fi
 			fi
 		done
-		if test -z "$HTTP_EXT_HASH_INCDIR"; then
+		if test "x$HTTP_EXT_HASH_INCDIR" = "x"; then
 			AC_MSG_RESULT([not found])
 		else
 			AC_MSG_RESULT([$HTTP_EXT_HASH_INCDIR])