projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- allow to avoid deps on shared extensions on build time
[m6w6/ext-http]
/
config.m4
diff --git
a/config.m4
b/config.m4
index 91b532fb3d35942754f08dc417c955602ff72184..0fc8c7f6c774f25eb3fc85914f10b6c0881571c8 100644
(file)
--- a/
config.m4
+++ b/
config.m4
@@
-13,6
+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-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)
if test "$PHP_HTTP" != "no"; then
if test "$PHP_HTTP" != "no"; then
@@
-31,6
+34,12
@@
if test "$PHP_HTTP" != "no"; then
])
])
])
])
+ if test "PHP_HTTP_SHARED_DEPS" != "no"; then
+ AC_DEFINE([HTTP_SHARED_DEPS], [1], [ ])
+ else
+ AC_DEFINE([HTTP_SHARED_DEPS], [0], [ ])
+ endif
+
dnl -------
dnl HEADERS
dnl -------
dnl -------
dnl HEADERS
dnl -------
@@
-39,7
+48,7
@@
dnl -------
dnl ----
dnl ZLIB
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
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
+168,11
@@
dnl ----
[AC_DEFINE([HAVE_CURL_EASY_RESET], [1], [ ])], [ ],
[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
)
[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 ----
fi
dnl ----
@@
-232,7
+246,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_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_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])
PHP_NEW_EXTENSION([http], $PHP_HTTP_SOURCES, $ext_shared)
PHP_ADD_BUILD_DIR($ext_builddir/phpstr, 1)
PHP_SUBST([HTTP_SHARED_LIBADD])
@@
-243,7
+258,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_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_querystring_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)
], [
ifdef([PHP_INSTALL_HEADERS], [
PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADERS)
], [