- drop mhash support
[m6w6/ext-http] / config.m4
index 21e5b7a4e76b8023a66d4cee96a67a492a73549e..1e8eff1a44d228fa434bebd4d35264ecd3e9929b 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -1,14 +1,12 @@
 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], [whether 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-magic-mime], [whether to enable response content type guessing],
 [  --with-http-magic-mime[=MAGICDIR]
                            With magic mime response content type guessing])
@@ -21,13 +19,7 @@ if test "$PHP_HTTP" != "no"; then
 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
@@ -35,7 +27,7 @@ dnl ----
        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 -r "$i/include/zlib.h"; then
+               if test -f "$i/include/zlib.h"; then
                        ZLIB_DIR=$i
                        break;
                fi
@@ -58,7 +50,7 @@ dnl ----
                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
@@ -85,13 +77,39 @@ dnl ----
                        AC_MSG_RESULT([found: $CURL_CONFIG])
                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
+               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
-               AC_CHECK_HEADERS([openssl/crypto.h])
-               
-               CURL_LIBS=`$CURL_CONFIG --libs`
                
                PHP_ADD_INCLUDE($CURL_DIR/include)
                PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
@@ -112,31 +130,6 @@ dnl ----
                )
        fi
 
-dnl ----
-dnl MHASH
-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
-                               break
-                       fi
-               done
-               if test -z "$MHASH_DIR"; then
-                       AC_MSG_RESULT([not found])
-                       AC_MSG_ERROR([could not find mhash.h])
-               else
-                       AC_MSG_RESULT([found in $MHASH_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])
-       fi
-
 dnl ----
 dnl MAGIC
 dnl ----
@@ -162,6 +155,12 @@ dnl ----
                AC_DEFINE([HTTP_HAVE_MAGIC], [1], [Have magic mime support])
        fi
 
+dnl ----
+dnl HASH
+dnl ----
+
+       dnl TODO
+
 dnl ----
 dnl DONE
 dnl ----
@@ -170,24 +169,22 @@ 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 http_encoding_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"
+       PHP_NEW_EXTENSION([http], $PHP_HTTP_SOURCES, $ext_shared)
        PHP_ADD_BUILD_DIR($ext_builddir/phpstr, 1)
        PHP_SUBST([HTTP_SHARED_LIBADD])
 
-       HTTP_HEADER_FILES="php_http_std_defs.h php_http.h php_http_api.h php_http_cache_api.h \
+       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_encodig_api.h"
-       PHP_SUBST([HTTP_HEADER_FILES])
+               php_http_encoding_api.h phpstr/phpstr.h"
+       PHP_SUBST([PHP_HTTP_HEADERS])
 
-       ifdef([PHP_INSTALL_HEADERS],
-       [
-               PHP_INSTALL_HEADERS(ext/http, $HTTP_HEADER_FILES)
-               PHP_INSTALL_HEADERS(ext/http/phpstr, [phpstr/phpstr.h])
-       ], [
-               PHP_ADD_MAKEFILE_FRAGMENT
-       ])
+       dnl outside src dir, adds install-http target
+       PHP_ADD_MAKEFILE_FRAGMENT
+       dnl within src dir, installs http headers
+       ifdef([PHP_INSTALL_HEADERS], [PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADERS)], [ ])
 
        AC_DEFINE([HAVE_HTTP], [1], [Have extended HTTP support])
 fi