update travis-pecl
[m6w6/ext-http] / config9.m4
index ec202b685e00c9dc70658050dbe3e7015129356b..5c697d050ff0dac88f882f195244da2086d3fa3b 100644 (file)
@@ -11,7 +11,7 @@ PHP_ARG_WITH([http-libcurl-dir], [],
 PHP_ARG_WITH([http-libevent-dir], [],
 [  --with-http-libevent-dir[=DIR] HTTP: where to find libevent], $PHP_HTTP_LIBCURL_DIR, "")
 PHP_ARG_WITH([http-libidn-dir], [],
-[  --with-http-libidn-dir=[=DIR]  HTTP: where to find libidn], $PHP_HTTP_LIBCURL_DIR, "")
+[  --with-http-libidn-dir[=DIR]   HTTP: where to find libidn], $PHP_HTTP_LIBCURL_DIR, "")
 
 if test "$PHP_HTTP" != "no"; then
 
@@ -31,22 +31,22 @@ if test "$PHP_HTTP" != "no"; then
                        AC_CHECK_PROG(SED, sed, sed)
                ])
        ])
-       
+
        AC_PROG_CPP
-       
+
        if test "$PHP_HTTP_SHARED_DEPS" != "no"; then
                AC_DEFINE([PHP_HTTP_SHARED_DEPS], [1], [ ])
        else
                AC_DEFINE([PHP_HTTP_SHARED_DEPS], [0], [ ])
        fi
-       
+
        dnl
        dnl HTTP_SHARED_DEP(name[, code-if-yes[, code-if-not]])
        dnl
        AC_DEFUN([HTTP_SHARED_DEP], [
                extname=$1
                haveext=$[PHP_HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)
-               
+
                AC_MSG_CHECKING([whether to add a dependency on ext/$extname])
                if test "$PHP_HTTP_SHARED_DEPS" = "no"; then
                        AC_MSG_RESULT([no])
@@ -63,7 +63,7 @@ if test "$PHP_HTTP" != "no"; then
                        $3
                fi
        ])
-       
+
        dnl
        dnl HTTP_HAVE_PHP_EXT(name[, code-if-yes[, code-if-not]])
        dnl
@@ -92,7 +92,35 @@ if test "$PHP_HTTP" != "no"; then
                        $3
                fi
        ])
-       
+
+       dnl
+       dnl HTTP_CURL_SSL_LIB_CHECK(ssllib[, code-if-yes[, code-if-not])
+       dnl
+       AC_DEFUN([HTTP_CURL_SSL_LIB_CHECK], [
+               AC_MSG_CHECKING([for $1 support in libcurl])
+               AC_TRY_RUN([
+                       #include <curl/curl.h>
+                       int main(int argc, char *argv[]) {
+                               curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
+                               if (data && data->ssl_version && *data->ssl_version) {
+                                       const char *ptr = data->ssl_version;
+                                       while(*ptr == ' ') ++ptr;
+                                       return strncasecmp(ptr, "$1", sizeof("$1")-1);
+                               }
+                               return 1;
+                       }
+               ], [
+                       AC_MSG_RESULT([yes])
+                       $2
+               ], [
+                       AC_MSG_RESULT([no])
+                       $3
+               ], [
+                       AC_MSG_RESULT([no])
+                       $3
+               ])
+       ])
+
 
 dnl ----
 dnl STDC
@@ -120,18 +148,70 @@ dnl ----
                        break;
                fi
        done
-       if test "x$IDNA_DIR" = "x"; then
-               AC_MSG_RESULT([not found])
-               case $host_os in
-               darwin*)
-                       AC_CHECK_HEADERS(unicode/uidna.h)
-                       PHP_CHECK_FUNC(uidna_IDNToASCII, icucore);;
-               esac
-       else
+       if test "x$IDNA_DIR" != "x"; then
                AC_MSG_RESULT([found in $IDNA_DIR])
                AC_DEFINE([PHP_HTTP_HAVE_IDN], [1], [Have libidn support])
                PHP_ADD_INCLUDE($IDNA_DIR/include)
                PHP_ADD_LIBRARY_WITH_PATH(idn, $IDNA_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
+               AC_MSG_CHECKING([for libidn version])
+               IDNA_VER=$(pkg-config --version libidn 2>/dev/null || echo unknown)
+               AC_MSG_RESULT([$IDNA_VER])
+               AC_DEFINE_UNQUOTED([PHP_HTTP_LIBIDN_VERSION], "$IDNA_VER", [ ])
+       else
+               AC_MSG_RESULT([not found])
+               AC_MSG_CHECKING([for idn2.h])
+               IDNA_DIR=
+               for i in "$PHP_HTTP_LIBIDN_DIR" "$IDN_DIR" /usr/local /usr /opt; do
+                       if test -f "$i/include/idn2.h"; then
+                               IDNA_DIR=$i
+                               break;
+                       fi
+               done
+               if test "x$IDNA_DIR" != "x"; then
+                       AC_MSG_RESULT([found in $IDNA_DIR])
+                       AC_DEFINE([PHP_HTTP_HAVE_IDN2], [1], [Have libidn2 support])
+                       PHP_ADD_INCLUDE($IDNA_DIR/include)
+                       PHP_ADD_LIBRARY_WITH_PATH(idn2, $IDNA_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
+                       AC_MSG_CHECKING([for libidn2 version])
+                       IDNA_VER=`$EGREP "define IDN2_VERSION " $IDNA_DIR/include/idn2.h | $SED -e's/^.*VERSION //g' -e 's/[[^0-9\.]]//g'`
+                       AC_MSG_RESULT([$IDNA_VER])
+                       AC_DEFINE_UNQUOTED([PHP_HTTP_LIBIDN2_VERSION], "$IDNA_VER", [ ])
+               else
+                       AC_MSG_RESULT([not found])
+                       AC_CHECK_HEADERS([unicode/uidna.h])
+                       case $host_os in
+                       darwin*)
+                               PHP_CHECK_FUNC(uidna_IDNToASCII, icucore);;
+                       *)
+                               AC_PATH_PROG(ICU_CONFIG, icu-config, no, [$PATH:/usr/local/bin])
+                               if test ! -x "$ICU_CONFIG"; then
+                                       ICU_CONFIG="icu-config"
+                               fi
+                               AC_MSG_CHECKING([for uidna_IDNToASCII])
+                               if ! test -x "$ICU_CONFIG"; then
+                                       ICU_CONFIG=icu-config
+                               fi
+                               if $ICU_CONFIG --exists 2>/dev/null >&2; then
+                                       save_LIBS=$LIBS
+                                       LIBS=$($ICU_CONFIG --ldflags)
+                                       AC_TRY_RUN([
+                                               #include <unicode/uidna.h>
+                                               int main(int argc, char *argv[]) {
+                                                       return uidna_IDNToASCII(0, 0, 0, 0, 0, 0, 0);
+                                               }
+                                       ], [
+                                               AC_MSG_RESULT([yes])
+                                               AC_DEFINE([HAVE_UIDNA_IDNTOASCII], [1], [ ])
+                                               LIBS=$save_LIBS
+                                               PHP_EVAL_LIBLINE(`$ICU_CONFIG --ldflags`, HTTP_SHARED_LIBADD)
+                                       ], [
+                                               LIBS=$save_LIBS
+                                               AC_MSG_RESULT([no])
+                                       ])
+                               fi
+                               ;;
+                       esac
+               fi
        fi
 
 dnl ----
@@ -160,7 +240,7 @@ dnl ----
                        PHP_ADD_LIBRARY_WITH_PATH(z, $ZLIB_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
                fi
        fi
-       
+
 dnl ----
 dnl CURL
 dnl ----
@@ -180,7 +260,7 @@ dnl ----
                        AC_MSG_RESULT([not found])
                else
                        AC_MSG_RESULT([found in $CURL_DIR])
-               
+
                        AC_MSG_CHECKING([for curl-config])
                        CURL_CONFIG=
                        for i in "$CURL_DIR/bin/curl-config" "$CURL_DIR/curl-config" `which curl-config`; do
@@ -195,7 +275,7 @@ dnl ----
                        else
                                AC_MSG_RESULT([found: $CURL_CONFIG])
                        fi
-               
+
                        dnl RHEL6:         7.19.7
                        dnl SUSE11:        7.19.7
                        dnl Debian wheezy: 7.26.0
@@ -207,7 +287,7 @@ dnl ----
                        if test `echo $CURL_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71802; then
                                AC_MSG_ERROR([libcurl version greater or equal to 7.18.2 required])
                        fi
-                       
+
                        AC_MSG_CHECKING([for HTTP2 support in libcurl])
                        if $CURL_CONFIG --features | $EGREP -q HTTP2; then
                                AC_MSG_RESULT([yes])
@@ -215,11 +295,11 @@ dnl ----
                        else
                                AC_MSG_RESULT([no])
                        fi
-               
+
                        dnl
                        dnl compile tests
                        dnl
-               
+
                        save_INCLUDES="$INCLUDES"
                        INCLUDES=
                        save_LIBS="$LIBS"
@@ -228,69 +308,44 @@ dnl ----
                        CFLAGS="$CFLAGS `$CURL_CONFIG --cflags`"
                        save_LDFLAGS="$LDFLAGS"
                        LDFLAGS="$ld_runpath_switch$CURL_DIR/$PHP_LIBDIR"
-               
+
                        AC_MSG_CHECKING([for SSL support in libcurl])
                        CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
                        CURL_SSL_LIBS=""
                        if test "$CURL_SSL" = "SSL"; then
                                AC_MSG_RESULT([yes])
                                AC_DEFINE([PHP_HTTP_HAVE_SSL], [1], [ ])
-                       
-                               AC_MSG_CHECKING([for openssl support in libcurl])
-                               AC_TRY_RUN([
-                                       #include <curl/curl.h>
-                                       int main(int argc, char *argv[]) {
-                                               curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
-                                               if (data && data->ssl_version && *data->ssl_version) {
-                                                       const char *ptr = data->ssl_version;
-                                                       while(*ptr == ' ') ++ptr;
-                                                       return strncasecmp(ptr, "OpenSSL", sizeof("OpenSSL")-1);
-                                               }
-                                               return 1;
-                                       }
-                               ], [
-                                       AC_MSG_RESULT([yes])
+
+                               HTTP_CURL_SSL_LIB_CHECK(OpenSSL, [
                                        AC_CHECK_HEADER([openssl/ssl.h], [
                                                AC_CHECK_HEADER([openssl/crypto.h], [
                                                        AC_DEFINE([PHP_HTTP_HAVE_OPENSSL], [1], [ ])
                                                        CURL_SSL_LIBS="ssl crypto"
                                                ])
                                        ])
-                               ], [
-                                       AC_MSG_RESULT([no])
-                               ], [
-                                       AC_MSG_RESULT([no])
                                ])
-                       
-                               AC_MSG_CHECKING([for gnutls support in libcurl])
-                               AC_TRY_RUN([
-                                       #include <curl/curl.h>
-                                       int main(int argc, char *argv[]) {
-                                               curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
-                                               if (data && data->ssl_version && *data->ssl_version) {
-                                                       const char *ptr = data->ssl_version;
-                                                       while(*ptr == ' ') ++ptr;
-                                                       return strncasecmp(ptr, "GnuTLS", sizeof("GnuTLS")-1);
-                                               }
-                                               return 1;
-                                       }
-                               ], [
-                                       AC_MSG_RESULT([yes])
+                               HTTP_CURL_SSL_LIB_CHECK(GnuTLS, [
                                        AC_CHECK_HEADER([gnutls.h], [
                                                AC_CHECK_HEADER([gcrypt.h], [
                                                        AC_DEFINE([PHP_HTTP_HAVE_GNUTLS], [1], [ ])
                                                        CURL_SSL_LIBS="gnutls gcrypt"
                                                ])
                                        ])
-                               ], [
-                                       AC_MSG_RESULT([no])
-                               ], [
-                                       AC_MSG_RESULT([no])
+                               ])
+                               HTTP_CURL_SSL_LIB_CHECK(NSS, [
+                                       AC_DEFINE([PHP_HTTP_HAVE_NSS], [1], [ ])
+                               ])
+                               HTTP_CURL_SSL_LIB_CHECK(SecureTransport, [
+                                       AC_DEFINE([PHP_HTTP_HAVE_DARWINSSL], [1], [ ])
+                               ])
+                               HTTP_CURL_SSL_LIB_CHECK(GSKit, [
+                                       AC_DEFINE([PHP_HTTP_HAVE_GSKIT], [1], [ ])
                                ])
                        else
+                               dnl no CURL_SSL
                                AC_MSG_RESULT([no])
                        fi
-                       
+
                        AC_MSG_CHECKING([for ares support in libcurl])
                        AC_TRY_RUN([
                                #include <curl/curl.h>
@@ -309,7 +364,7 @@ dnl ----
                        ], [
                                AC_MSG_RESULT([no])
                        ])
-                       
+
                        AC_MSG_CHECKING([whether CURLOPT_TLSAUTH_TYPE expects CURL_TLSAUTH_SRP or literal "SRP"])
                        AC_TRY_RUN([
                                #include <curl/curl.h>
@@ -336,24 +391,24 @@ dnl ----
                                        AC_MSG_RESULT([neither])
                                ], [
                                        AC_MSG_RESULT([neither])
-                               ])                      
+                               ])
                        ], [
                                AC_MSG_RESULT([neither])
                        ])
-               
+
                        INCLUDES="$save_INCLUDES"
                        LIBS="$save_LIBS"
                        CFLAGS="$save_CFLAGS"
                        LDFLAGS="$save_LDFLAGS"
-                       
+
                        if test -n "$CURL_SSL_LIBS"; then
                                for CURL_SSL_LIB in $CURL_SSL_LIBS; do
                                        PHP_ADD_LIBRARY_WITH_PATH([$CURL_SSL_LIB], $CURL_DIR/$PHP_LIBDIR, PHP_HTTP_SHARED_LIBADD)
                                done
                        fi
-                       
+
                        dnl end compile tests
-               
+
                        AC_MSG_CHECKING([for bundled SSL CA info])
                        CURL_CAINFO=
                        for i in `$CURL_CONFIG --ca` "/etc/ssl/certs/ca-certificates.crt" "/etc/ssl/certs/ca-bundle.crt"; do
@@ -368,7 +423,7 @@ dnl ----
                                AC_MSG_RESULT([$CURL_CAINFO])
                                AC_DEFINE_UNQUOTED([PHP_HTTP_CURL_CAINFO], ["$CURL_CAINFO"], [path to bundled SSL CA info])
                        fi
-               
+
                        PHP_ADD_INCLUDE($CURL_DIR/include)
                        PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
                        PHP_EVAL_LIBLINE(`$CURL_CONFIG --libs`, HTTP_SHARED_LIBADD)
@@ -398,9 +453,9 @@ dnl ----
                        AC_DEFINE([PHP_HTTP_HAVE_EVENT], [0], [ ])
                else
                        AC_MSG_RESULT([found in $EVENT_DIR])
-                       
+
                        AC_MSG_CHECKING([for libevent version, roughly])
-                       
+
                        if test -f "$EVENT_DIR/include/event2/event.h"; then
                                EVENT_VER="`$AWK '/_EVENT_VERSION/ {gsub(/\"/,\"\",$3); print $3}' < $EVENT_DIR/include/event2/event-config.h`"
                                AC_DEFINE([PHP_HTTP_HAVE_EVENT2], [1], [ ])
@@ -418,7 +473,7 @@ dnl ----
                        fi
                        AC_DEFINE_UNQUOTED([PHP_HTTP_EVENT_VERSION], ["$EVENT_VER"], [ ])
                        AC_MSG_RESULT([$EVENT_VER])
-                       
+
                        PHP_ADD_INCLUDE($EVENT_DIR/include)
                        PHP_ADD_LIBRARY_WITH_PATH(event, $EVENT_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
                        AC_DEFINE([PHP_HTTP_HAVE_EVENT], [1], [Have libevent support for cURL])
@@ -510,12 +565,6 @@ dnl ----
                fi
        ])
 
-dnl ----
-dnl JSON
-dnl ----
-       HTTP_HAVE_PHP_EXT([json])
-
-
 dnl ----
 dnl ICONV
 dnl ----
@@ -524,91 +573,36 @@ dnl ----
 dnl ----
 dnl DONE
 dnl ----
-       PHP_HTTP_SOURCES="\
-               php_http_buffer.c \
-               php_http.c \
-               php_http_client.c \
-               php_http_client_curl.c \
-               php_http_client_request.c \
-               php_http_client_response.c \
-               php_http_cookie.c \
-               php_http_curl.c \
-               php_http_encoding.c \
-               php_http_env.c \
-               php_http_env_request.c \
-               php_http_env_response.c \
-               php_http_etag.c \
-               php_http_exception.c \
-               php_http_filter.c \
-               php_http_header_parser.c \
-               php_http_header.c \
-               php_http_info.c \
-               php_http_message_body.c \
-               php_http_message.c \
-               php_http_message_parser.c \
-               php_http_misc.c \
-               php_http_negotiate.c \
-               php_http_object.c \
-               php_http_options.c \
-               php_http_params.c \
-               php_http_querystring.c \
-               php_http_url.c \
-               php_http_version.c \
-       "
-       PHP_NEW_EXTENSION([http], $PHP_HTTP_SOURCES, $ext_shared)
-       
-       dnl shared extension deps
+
+       PHP_SUBST([HTTP_SHARED_LIBADD])
+
+       PHP_HTTP_SRCDIR=PHP_EXT_SRCDIR(http)
+       PHP_HTTP_BUILDDIR=PHP_EXT_BUILDDIR(http)
+
+       PHP_ADD_INCLUDE($PHP_HTTP_SRCDIR/src)
+       PHP_ADD_BUILD_DIR($PHP_HTTP_BUILDDIR/src)
+
+       PHP_HTTP_HEADERS=`(cd $PHP_HTTP_SRCDIR/src && echo *.h)`
+       PHP_HTTP_SOURCES=`(cd $PHP_HTTP_SRCDIR && echo src/*.c)`
+
+       PHP_NEW_EXTENSION(http, $PHP_HTTP_SOURCES, $ext_shared)
+       PHP_INSTALL_HEADERS(ext/http, php_http.h $PHP_HTTP_HEADERS)
+
        HTTP_SHARED_DEP([hash])
        HTTP_SHARED_DEP([iconv])
-       HTTP_SHARED_DEP([json])
-       
-       dnl extension deps
        PHP_ADD_EXTENSION_DEP([http], [raphf], true)
-       PHP_ADD_EXTENSION_DEP([http], [propo], true)
-       
-       PHP_SUBST([HTTP_SHARED_LIBADD])
+       PHP_ADD_EXTENSION_DEP([http], [propro], true)
+
+       PHP_SUBST(PHP_HTTP_HEADERS)
+       PHP_SUBST(PHP_HTTP_SOURCES)
 
-       PHP_HTTP_HEADERS="
-               php_http_api.h \
-               php_http_buffer.h \
-               php_http_curl_client.h \
-               php_http_curl_client_datashare.h \
-               php_http_client_datashare.h \
-               php_http_client_factory.h \
-               php_http_client.h \
-               php_http_client_interface.h \
-               php_http_curl_client_pool.h \
-               php_http_client_pool.h \
-               php_http_client_request.h \
-               php_http_client_response.h \
-               php_http_cookie.h \
-               php_http_curl.h \
-               php_http_encoding.h \
-               php_http_env.h \
-               php_http_env_request.h \
-               php_http_env_response.h \
-               php_http_etag.h \
-               php_http_exception.h \
-               php_http_filter.h \
-               php_http.h \
-               php_http_header_parser.h \
-               php_http_header.h \
-               php_http_info.h \
-               php_http_message_body.h \
-               php_http_message.h \
-               php_http_message_parser.h \
-               php_http_misc.h \
-               php_http_negotiate.h \
-               php_http_object.h \
-               php_http_options.h \
-               php_http_params.h \
-               php_http_querystring.h \
-               php_http_response_codes.h \
-               php_http_url.h \
-               php_http_utf8.h \
-               php_http_version.h \
-       "
-       PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADERS)
+       PHP_SUBST(PHP_HTTP_SRCDIR)
+       PHP_SUBST(PHP_HTTP_BUILDDIR)
+
+       PHP_ADD_MAKEFILE_FRAGMENT
 
        AC_DEFINE([HAVE_HTTP], [1], [Have extended HTTP support])
+       if $HTTP_HAVE_A_REQUEST_LIB; then
+               AC_DEFINE([PHP_HTTP_HAVE_CLIENT], [1], [Have HTTP client support])
+       fi
 fi