X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config.m4;h=0afce19355300457f472b613a18e99c9d47de18f;hp=90e3a3d34f8ac3a89431f260627aaffbcd24e00b;hb=45abbc6fd229be01e963e9642a03118d3c99131c;hpb=61f165688d2cc39424678829a145c8cbab51d1af diff --git a/config.m4 b/config.m4 index 90e3a3d..0afce19 100644 --- a/config.m4 +++ b/config.m4 @@ -1,37 +1,79 @@ dnl config.m4 for pecl/http dnl $Id$ +dnl vim: noet ts=1 sw=1 PHP_ARG_ENABLE([http], [whether to enable extended HTTP support], [ --enable-http Enable extended HTTP support]) -PHP_ARG_WITH([http-curl-requests], [wheter to enable cURL HTTP requests], -[ --with-http-curl-requests[=CURLDIR] - With cURL HTTP request support]) -PHP_ARG_WITH([http-mhash-etags], [whether to enable mhash ETag generator], -[ --with-http-mhash-etags[=MHASHDIR] - With mhash ETag generator support]) +PHP_ARG_WITH([http-curl-requests], [whether to enable cURL HTTP request support], +[ --with-http-curl-requests[=LIBCURLDIR] + HTTP: with cURL request support], "yes") +PHP_ARG_WITH([http-zlib-compression], [whether to enable zlib encodings support], +[ --with-http-zlib-compression[=LIBZDIR] + HTTP: with 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]) if test "$PHP_HTTP" != "no"; then + ifdef([AC_PROG_EGREP], [ + AC_PROG_EGREP + ], [ + AC_CHECK_PROG(EGREP, egrep, egrep) + ]) + ifdef([AC_PROG_SED], [ + AC_PROG_SED + ], [ + ifdef([LT_AC_PROG_SED], [ + LT_AC_PROG_SED + ], [ + AC_CHECK_PROG(SED, sed, sed) + ]) + ]) + dnl ------- dnl NETDB.H dnl ------- - AC_MSG_CHECKING(for netdb.h) - if test -r /usr/include/netdb.h -o -r /usr/local/include/netdb.h; then - AC_DEFINE(HAVE_NETDB_H, 1, [Have netdb.h]) - AC_MSG_RESULT(found in default path) - else - AC_MSG_RESULT(not found in default path) - fi + AC_CHECK_HEADERS([netdb.h]) +dnl ---- +dnl ZLIB +dnl ---- + if test "$PHP_HTTP_ZLIB_ENCODINGS" != "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 + if test -f "$i/include/zlib.h"; then + ZLIB_DIR=$i + break; + fi + done + if test -z "$ZLIB_DIR"; then + AC_MSG_RESULT([not found]) + AC_MSG_WARN([could not find zlib.h]) + else + AC_MSG_RESULT([found in $ZLIB_DIR]) + AC_MSG_CHECKING([for zlib version >= 1.2.0.4]) + ZLIB_VERSION=`$EGREP "define ZLIB_VERSION" $ZLIB_DIR/include/zlib.h | $SED -e 's/[[^0-9\.]]//g'` + AC_MSG_RESULT([$ZLIB_VERSION]) + if test `echo $ZLIB_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*1000000 + $2*10000 + $3*100 + $4}'` -lt 1020004; then + AC_MSG_ERROR([libz version greater or equal to 1.2.0.4 required]) + else + PHP_ADD_INCLUDE($ZLIB_DIR/include) + PHP_ADD_LIBRARY_WITH_PATH(z, $ZLIB_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD) + AC_DEFINE([HTTP_HAVE_ZLIB], [1], [Have zlib support]) + fi + fi + fi + dnl ---- dnl CURL dnl ---- if test "$PHP_HTTP_CURL_REQUESTS" != "no"; then - AC_MSG_CHECKING([for curl/curl.h]) CURL_DIR= for i in "$PHP_HTTP_CURL_REQUESTS" /usr/local /usr /opt; do - if test -r "$i/include/curl/curl.h"; then + if test -f "$i/include/curl/curl.h"; then CURL_DIR=$i break fi @@ -58,8 +100,48 @@ dnl ---- AC_MSG_RESULT([found: $CURL_CONFIG]) fi + dnl Debian stable has currently 7.13.2 (this is not a typo) + AC_MSG_CHECKING([for curl version >= 7.12.3]) + CURL_VERSION=`$CURL_CONFIG --version | $SED -e 's/[[^0-9\.]]//g'` + AC_MSG_RESULT([$CURL_VERSION]) + if test `echo $CURL_VERSION | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71203; then + AC_MSG_ERROR([libcurl version greater or equal to 7.12.3 required]) + fi + CURL_LIBS=`$CURL_CONFIG --libs` + AC_MSG_CHECKING([for SSL support in libcurl]) + CURL_SSL=`$CURL_CONFIG --features | $EGREP SSL` + if test "$CURL_SSL" = "SSL"; then + AC_MSG_RESULT([yes]) + AC_DEFINE([HTTP_HAVE_SSL], [1], [ ]) + + 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 + done + if test -z "$CURL_SSL_FLAVOUR"; then + AC_MSG_RESULT([unknown!]) + AC_MSG_WARN([Could not determine the type of SSL library used!]) + AC_MSG_WARN([Building will fail in ZTS mode!]) + fi + else + AC_MSG_RESULT([no]) + fi + PHP_ADD_INCLUDE($CURL_DIR/include) PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD) PHP_EVAL_LIBLINE($CURL_LIBS, HTTP_SHARED_LIBADD) @@ -73,31 +155,71 @@ dnl ---- [AC_DEFINE([HAVE_CURL_EASY_STRERROR], [1], [ ])], [ ], [$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR] ) + PHP_CHECK_LIBRARY(curl, curl_easy_reset, + [AC_DEFINE([HAVE_CURL_EASY_RESET], [1], [ ])], [ ], + [$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR] + ) fi dnl ---- -dnl MHASH +dnl MAGIC dnl ---- - if test "$PHP_HTTP_MHASH_ETAGS" != "no"; then - - AC_MSG_CHECKING([for mhash.h]) - MHASH_DIR= - for i in "$PHP_HTTP_MHASH_ETAGS" /usr/local /usr /opt; do - if test -f "$i/include/mhash.h"; then - MHASH_DIR=$i + if test "$PHP_HTTP_MAGIC_MIME" != "no"; then + AC_MSG_CHECKING([for magic.h]) + MAGIC_DIR= + for i in "$PHP_HTTP_MAGIC_MIME" /usr/local /usr /opt; do + if test -f "$i/include/magic.h"; then + MAGIC_DIR=$i break fi done - if test -z "$MHASH_DIR"; then + if test -z "$MAGIC_DIR"; then AC_MSG_RESULT([not found]) - AC_MSG_ERROR([could not find mhash.h]) + AC_MSG_ERROR([could not find magic.h]) else - AC_MSG_RESULT([found in $MHASH_DIR]) + AC_MSG_RESULT([found in $MAGIC_DIR]) fi - - PHP_ADD_INCLUDE($MHASH_DIR/include) - PHP_ADD_LIBRARY_WITH_PATH(mhash, $MHASH_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD) - AC_DEFINE([HTTP_HAVE_MHASH], [1], [Have mhash support]) + + PHP_ADD_INCLUDE($MAGIC_DIR/include) + PHP_ADD_LIBRARY_WITH_PATH(magic, $MAGIC_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD) + AC_DEFINE([HTTP_HAVE_MAGIC], [1], [Have magic mime support]) + fi + +dnl ---- +dnl HASH +dnl ---- + AC_MSG_CHECKING(for ext/hash support) + if test -x "$PHP_EXECUTABLE"; then + if test "`$PHP_EXECUTABLE -m | $EGREP '^hash$'`" = "hash"; then + if test -d ../hash; then + PHP_ADD_INCLUDE([../hash]) + fi + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS=$INCLUDES + AC_MSG_RESULT([looking for php_hash.h]) + 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; + else + AC_MSG_RESULT(disabled) + fi + elif test "$PHP_HASH" != "no" && test "x$PHP_HASH" != "x"; then + AC_MSG_RESULT(enabled) + ifdef([PHP_ADD_EXTENSION_DEP], [ + PHP_ADD_EXTENSION_DEP([http], [hash], 0) + AC_DEFINE([HTTP_HAVE_EXT_HASH_EXT_HASH], [1], [Have ext/hash support]) + ]) + else + AC_MSG_RESULT(disabled) fi dnl ---- @@ -108,17 +230,26 @@ dnl ---- http_response_object.c http_exception_object.c http_requestpool_object.c \ 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" - PHP_NEW_EXTENSION([http], $PHP_HTTP_SOURCES, [$ext_shared]) + 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" + PHP_NEW_EXTENSION([http], $PHP_HTTP_SOURCES, $ext_shared) PHP_ADD_BUILD_DIR($ext_builddir/phpstr, 1) PHP_SUBST([HTTP_SHARED_LIBADD]) - PHP_ADD_MAKEFILE_FRAGMENT - AC_DEFINE([HAVE_HTTP], [1], [Have extended HTTP support]) -dnl --- -dnl odd warnings -dnl --- -dnl CFLAGS=" -g -O2 -W -Wchar-subscripts -Wformat=2 -Wno-format-y2k -Wimplicit -Wmissing-braces -Wunused-variable -Wbad-function-cast -Wpointer-arith -Wsign-compare -Winline" -dnl PHP_SUBST([CFLAGS]) + PHP_HTTP_HEADERS="php_http_std_defs.h php_http.h php_http_api.h php_http_cache_api.h \ + php_http_date_api.h php_http_headers_api.h php_http_info_api.h php_http_message_api.h \ + php_http_request_api.h php_http_request_method_api.h php_http_send_api.h php_http_url_api.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_deflatestream_object.h php_http_inflatestream_object.h" + ifdef([PHP_INSTALL_HEADERS], [ + PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADERS) + ], [ + PHP_SUBST([PHP_HTTP_HEADERS]) + PHP_ADD_MAKEFILE_FRAGMENT + ]) + AC_DEFINE([HAVE_HTTP], [1], [Have extended HTTP support]) fi