- fix build on Debian systems where access to Curl_* functions is prohibited

[m6w6/ext-http] / config.m4

diff --git a/config.m4 b/config.m4
index 38d84519a96a38a8671fa479be032cd1ece43c7d..0339acc3e74177b5cd3f6f71e0a8197cf69b9271 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -39,7 +39,7 @@ dnl -------
 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" /usr/local /usr /opt; do
@@ -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 ----
@@ -232,7 +237,8 @@ dnl ----
                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_querystring_object.c \
-               http_deflatestream_object.c http_inflatestream_object.c http_cookie_api.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])
@@ -244,7 +250,7 @@ dnl ----
                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_querystring_object.h php_http_deflatestream_object.h php_http_inflatestream_object.h \
-               php_http_cookie_api.h"
+               php_http_cookie_api.h php_http_querystring_api.h"
        ifdef([PHP_INSTALL_HEADERS], [
                PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADERS)
        ], [