X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=config.m4;h=0339acc3e74177b5cd3f6f71e0a8197cf69b9271;hb=1bb903f3aad484c7adf638af3365cb7c668d3281;hp=53cde183704dd3cc283f792025df2d13e26561a7;hpb=85e32209907a4d01823ffebafd4f83cb7c72da98;p=m6w6%2Fext-http

diff --git a/config.m4 b/config.m4
index 53cde18..0339acc 100644
--- a/config.m4
+++ b/config.m4
@@ -32,17 +32,17 @@ if test "$PHP_HTTP" != "no"; then
 	])
 
 dnl -------
-dnl NETDB.H
+dnl HEADERS
 dnl -------
-	AC_CHECK_HEADERS([netdb.h])
+	AC_CHECK_HEADERS([netdb.h unistd.h])
 
 dnl ----
 dnl ZLIB
 dnl ----
-	if test "$PHP_HTTP_ZLIB_ENCODINGS" != "no"; then
+	if test "$PHP_HTTP_ZLIB_COMPRESSION" != "no"; then
 		AC_MSG_CHECKING([for zlib.h])
 		ZLIB_DIR=
-		for i in "$PHP_HTTP_ZLIB_COMPRESSION" "$PHP_ZLIB_DIR" "$PHP_ZLIB" /user/local /usr /opt; do
+		for i in "$PHP_HTTP_ZLIB_COMPRESSION" "$PHP_ZLIB_DIR" "$PHP_ZLIB" /usr/local /usr /opt; do
 			if test -f "$i/include/zlib.h"; then
 				ZLIB_DIR=$i
 				break;
@@ -159,6 +159,11 @@ 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]
+		)
 	fi
 
 dnl ----
@@ -231,8 +236,9 @@ 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 \
-		http_filter_api.c http_request_body_api.c \
-		http_deflatestream_object.c http_inflatestream_object.c"
+		http_filter_api.c http_request_body_api.c http_querystring_object.c \
+		http_deflatestream_object.c http_inflatestream_object.c http_cookie_api.c \
+		http_querystring_api.c"
 	PHP_NEW_EXTENSION([http], $PHP_HTTP_SOURCES, $ext_shared)
 	PHP_ADD_BUILD_DIR($ext_builddir/phpstr, 1)
 	PHP_SUBST([HTTP_SHARED_LIBADD])
@@ -243,7 +249,8 @@ dnl ----
 		php_http_encoding_api.h phpstr/phpstr.h missing.h php_http_request_body_api.h \
 		php_http_exception_object.h php_http_message_object.h php_http_request_object.h \
 		php_http_requestpool_object.h php_http_response_object.h php_http_util_object.h \
-		php_http_deflatestream_object.h php_http_inflatestream_object.h"
+		php_http_querystring_object.h php_http_deflatestream_object.h php_http_inflatestream_object.h \
+		php_http_cookie_api.h php_http_querystring_api.h"
 	ifdef([PHP_INSTALL_HEADERS], [
 		PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADERS)
 	], [