X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=config9.m4;h=55397a75d78f5f53beaf22a7513e3045fcf0ae1d;hb=6aca56d611a22eb559098f3c02c31634a6f9ff9f;hp=e1c4ab8831c87d703538695001a47cce06cd7ffe;hpb=fb5d0ef47f1f54dad0efa1f091324e3d7d18050b;p=m6w6%2Fext-http

diff --git a/config9.m4 b/config9.m4
index e1c4ab8..55397a7 100644
--- a/config9.m4
+++ b/config9.m4
@@ -54,7 +54,7 @@ if test "$PHP_HTTP" != "no"; then
 		elif test "$haveext"; then
 			AC_MSG_RESULT([yes])
 			ifdef([PHP_ADD_EXTENSION_DEP], [
-				PHP_ADD_EXTENSION_DEP([http], $1, 0)
+				PHP_ADD_EXTENSION_DEP([http], $1, true)
 			])
 			$2
 		else
@@ -93,10 +93,14 @@ if test "$PHP_HTTP" != "no"; then
 		fi
 	])
 
-dnl -------
-dnl HEADERS
-dnl -------
+dnl ----
+dnl STDC
+dnl ----
 	AC_CHECK_HEADERS([netdb.h unistd.h])
+	PHP_CHECK_FUNC(gethostname, nsl)
+	PHP_CHECK_FUNC(getdomainname, nsl)
+	PHP_CHECK_FUNC(getservbyport, nsl)
+	PHP_CHECK_FUNC(getservbyname, nsl)
 
 dnl ----
 dnl ZLIB
@@ -112,7 +116,7 @@ dnl ----
 		done
 		if test -z "$ZLIB_DIR"; then
 			AC_MSG_RESULT([not found])
-			AC_MSG_WARN([could not find zlib.h])
+			AC_MSG_ERROR([could not find zlib.h])
 		else
 			AC_MSG_RESULT([found in $ZLIB_DIR])
 			AC_MSG_CHECKING([for zlib version >= 1.2.0.4])
@@ -181,19 +185,22 @@ dnl ----
 			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
+				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!])
@@ -226,6 +233,11 @@ dnl ----
 			[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]
+		)
 	fi
 
 dnl ----