X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=config9.m4;h=7bbb2c2b587184b49719f4f20300ed6b24091fe4;hb=c8dff7011092296f9fcc12e68ad8eef18b19cdf4;hp=648cc5b0972576250a10a509686efa6bcad6b16d;hpb=46fc12676a53668d55fe6d02d44210e2eaf4b6b5;p=m6w6%2Fext-http

diff --git a/config9.m4 b/config9.m4
index 648cc5b..7bbb2c2 100644
--- a/config9.m4
+++ b/config9.m4
@@ -13,9 +13,9 @@ PHP_ARG_WITH([http-zlib-compression], [whether to enable zlib encodings support]
 PHP_ARG_WITH([http-magic-mime], [whether to enable response content type guessing],
 [  --with-http-magic-mime[=LIBMAGICDIR]
                            HTTP: with magic mime response content type guessing], "no", "no")
-PHP_ARG_WITH([http-shared-deps], [whether to depend on shared extensions],
-[  --with-http-shared-deps HTTP: disable to not depend on shared extensions
-                           like SPL, hash, iconv and session], $PHP_HTTP, $PHP_HTTP)
+PHP_ARG_WITH([http-shared-deps], [whether to depend on extensions which have been built shared],
+[  --with-http-shared-deps  HTTP: disable to not depend on extensions like hash,
+                                 iconv and session (when built shared)], $PHP_HTTP, $PHP_HTTP)
 
 if test "$PHP_HTTP" != "no"; then
 
@@ -69,10 +69,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
+			if test "`$PHP_EXECUTABLE -m | $EGREP ^$extname\$`" = "$extname"; then
 				[HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)=1
 				AC_MSG_RESULT([yes])
 				$2
@@ -92,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
@@ -111,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])
@@ -180,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!])
@@ -225,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 ----
@@ -255,23 +268,26 @@ dnl ----
 dnl HASH
 dnl ----
 	HTTP_HAVE_PHP_EXT([hash], [
-		if test -d ../hash; then
-			PHP_ADD_INCLUDE([../hash])
+		AC_MSG_CHECKING([for php_hash.h])
+		HTTP_EXT_HASH_INCDIR=
+		for i in `echo $INCLUDES | $SED -e's/-I//g'` $abs_srcdir ../hash; do
+			if test -d $i; then
+				if test -f $i/php_hash.h; then
+					HTTP_EXT_HASH_INCDIR=$i
+					break
+				elif test -f $i/ext/hash/php_hash.h; then
+					HTTP_EXT_HASH_INCDIR=$i/ext/hash
+					break
+				fi
+			fi
+		done
+		if test -z "$HTTP_EXT_HASH_INCDIR"; then
+			AC_MSG_RESULT([not found])
+		else
+			AC_MSG_RESULT([$HTTP_EXT_HASH_INCDIR])
+			AC_DEFINE([HTTP_HAVE_PHP_HASH_H], [1], [Have ext/hash support])
+			PHP_ADD_INCLUDE([$HTTP_EXT_HASH_INCDIR])
 		fi
-		old_CPPFLAGS=$CPPFLAGS
-		CPPFLAGS=$INCLUDES
-		AC_CHECK_HEADER([ext/hash/php_hash.h], [
-			AC_DEFINE([HTTP_HAVE_EXT_HASH_EXT_HASH], [1], [Have ext/hash support])
-		], [ 
-			AC_CHECK_HEADER([hash/php_hash.h], [
-				AC_DEFINE([HTTP_HAVE_HASH_EXT_HASH], [1], [Have ext/hash support])
-			], [ 
-				AC_CHECK_HEADER([php_hash.h], [
-					AC_DEFINE([HTTP_HAVE_EXT_HASH], [1], [Have ext/hash support])
-				])
-			])
-		])
-		CPPFLAGS=$old_CPPFLAGS
 	])
 
 dnl ----
@@ -284,11 +300,6 @@ dnl SESSION
 dnl ----
 	HTTP_HAVE_PHP_EXT([session])
 
-dnl ----
-dnl SPL
-dnl ----
-	HTTP_HAVE_PHP_EXT([spl])
-
 dnl ----
 dnl DONE
 dnl ----
@@ -308,7 +319,6 @@ dnl ----
 	HTTP_SHARED_DEP([hash])
 	HTTP_SHARED_DEP([iconv])
 	HTTP_SHARED_DEP([session])
-	HTTP_SHARED_DEP([spl])
 	
 	PHP_ADD_BUILD_DIR($ext_builddir/phpstr, 1)
 	PHP_SUBST([HTTP_SHARED_LIBADD])