Fix bug #68000 Extension does not build on FreeBSD
[m6w6/ext-http] / config9.m4
index 2351eb59362cdcff6be7d2cd2078ef54c1d5c265..686b5ea286aaaca9349956f228a55c45eeef4457 100644 (file)
@@ -68,7 +68,6 @@ if test "$PHP_HTTP" != "no"; then
        AC_DEFUN([HTTP_HAVE_PHP_EXT], [
                extname=$1
                haveext=$[PHP_]translit($1,a-z_-,A-Z__)
-               
                AC_MSG_CHECKING([for ext/$extname support])
                if test -x "$PHP_EXECUTABLE"; then
                        grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$`
@@ -96,11 +95,11 @@ if test "$PHP_HTTP" != "no"; then
 dnl ----
 dnl STDC
 dnl ----
+       AC_TYPE_OFF_T
+       dnl getdomainname() is declared in netdb.h on some platforms: AIX, OSF
        AC_CHECK_HEADERS([netdb.h unistd.h])
        PHP_CHECK_FUNC(gethostname, nsl)
        PHP_CHECK_FUNC(getdomainname, nsl)
-       PHP_CHECK_FUNC(getservbyport, nsl)
-       PHP_CHECK_FUNC(getservbyname, nsl)
 
 dnl ----
 dnl ZLIB
@@ -129,39 +128,6 @@ dnl ----
                fi
        fi
        
-dnl ----
-dnl SERF
-dnl ----
-
-       if test "$PHP_HTTP_LIBSERF_DIR" = "no"; then
-               AC_DEFINE([PHP_HTTP_HAVE_SERF], [0], [ ])
-       else
-               AC_MSG_CHECKING([for serf-?/serf.h])
-               SERF_DIR=
-               for i in "$PHP_HTTP_LIBSERF_DIR" /usr/local /usr /opt; do
-                       if test -f "$i/include/serf-0/serf.h"; then
-                               SERF_DIR=$i
-                               SERF_VER=0
-                               break
-                       elif test -f "$i/include/serf-1/serf.h"; then
-                               SERF_DIR=$i
-                               SERF_VER=1
-                       fi
-               done
-
-               if test "x$SERF_DIR" = "x"; then
-                       AC_MSG_RESULT([not found])
-                       AC_DEFINE([PHP_HTTP_HAVE_SERF], [0], [ ])
-               else
-                       AC_MSG_RESULT([found in $SERF_DIR])
-
-                       PHP_ADD_INCLUDE($SERF_DIR/include/serf-$SERF_VER)
-                       PHP_ADD_LIBRARY_WITH_PATH(serf-$SERF_VER, $SERF_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
-                       AC_DEFINE([PHP_HTTP_HAVE_SERF], [1], [Have libserf support])
-                       HTTP_HAVE_A_REQUEST_LIB=true
-               fi
-       fi
-       
 dnl ----
 dnl CURL
 dnl ----
@@ -197,7 +163,11 @@ dnl ----
                                AC_MSG_RESULT([found: $CURL_CONFIG])
                        fi
                
-                       dnl Debian stable has currently 7.18.2
+                       dnl RHEL6:         7.19.7
+                       dnl SUSE11:        7.19.7
+                       dnl Debian wheezy: 7.26.0
+                       dnl Debian sqeeze: 7.21.0
+                       dnl Debian ancient 7.18.2
                        AC_MSG_CHECKING([for curl version >= 7.18.2])
                        CURL_VERSION=`$CURL_CONFIG --version | $SED -e 's/[[^0-9\.]]//g'`
                        AC_MSG_RESULT([$CURL_VERSION])
@@ -214,13 +184,13 @@ dnl ----
                        save_LIBS="$LIBS"
                        LIBS=
                        save_CFLAGS="$CFLAGS"
-                       CFLAGS=`$CURL_CONFIG --cflags`
+                       CFLAGS="$CFLAGS `$CURL_CONFIG --cflags`"
                        save_LDFLAGS="$LDFLAGS"
-                       LDFLAGS=`$CURL_CONFIG --libs`
-                       LDFLAGS="$LDFLAGS $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR"
+                       LDFLAGS="$LDFLAGS `$CURL_CONFIG --libs` $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], [ ])
@@ -239,9 +209,11 @@ dnl ----
                                        }
                                ], [
                                        AC_MSG_RESULT([yes])
-                                       AC_CHECK_HEADER([openssl/crypto.h], [
-                                               AC_DEFINE([PHP_HTTP_HAVE_OPENSSL], [1], [ ])
-                                               CURL_SSL="crypto"
+                                       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])
@@ -263,9 +235,11 @@ dnl ----
                                        }
                                ], [
                                        AC_MSG_RESULT([yes])
-                                       AC_CHECK_HEADER([gcrypt.h], [
-                                               AC_DEFINE([PHP_HTTP_HAVE_GNUTLS], [1], [ ])
-                                               CURL_SSL="gcrypt"
+                                       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])
@@ -275,17 +249,42 @@ dnl ----
                        else
                                AC_MSG_RESULT([no])
                        fi
+                       
+                       AC_MSG_CHECKING([for ares 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->ares && data->ares_num0) {
+                                               return 0;
+                                       }
+                                       return 1;
+                               }
+                       ], [
+                               AC_MSG_RESULT([yes])
+                               AC_DEFINE([PHP_HTTP_HAVE_ARES], [1], [ ])
+                       ], [
+                               AC_MSG_RESULT([no])
+                       ], [
+                               AC_MSG_RESULT([no])
+                       ])
                
                        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"; do
+                       for i in `$CURL_CONFIG --ca` "/etc/ssl/certs/ca-certificates.crt" "/etc/ssl/certs/ca-bundle.crt"; do
                                if test -f "$i"; then
                                        CURL_CAINFO="$i"
                                        break
@@ -301,9 +300,6 @@ dnl ----
                        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)
-                       if test "x$CURL_SSL" != "x"; then
-                               PHP_ADD_LIBRARY_WITH_PATH([$CURL_SSL], $CURL_DIR/$PHP_LIBDIR, PHP_HTTP_SHARED_LIBADD)
-                       fi
                        AC_DEFINE([PHP_HTTP_HAVE_CURL], [1], [Have libcurl support])
                        HTTP_HAVE_A_REQUEST_LIB=true
                fi
@@ -316,44 +312,103 @@ dnl ----
        if test "$PHP_HTTP_LIBEVENT_DIR" = "no"; then
                AC_DEFINE([PHP_HTTP_HAVE_EVENT], [0], [ ])
        else
-               HTTP_HAVE_PHP_EXT([event], [
-                       AC_MSG_WARN([event support is incompatible with pecl/event; continuing without libevent support])
+               AC_MSG_CHECKING([for event2/event.h])
+               EVENT_DIR=
+               for i in "$PHP_HTTP_LIBEVENT_DIR" /usr/local /usr /opt; do
+                       if test -f "$i/include/event.h"; then
+                               EVENT_DIR=$i
+                               break
+                       fi
+               done
+               if test "x$EVENT_DIR" = "x"; then
+                       AC_MSG_RESULT([not found])
+                       AC_MSG_WARN([continuing without libevent support])
                        AC_DEFINE([PHP_HTTP_HAVE_EVENT], [0], [ ])
-               ], [
-                       AC_MSG_CHECKING([for event.h])
-                       EVENT_DIR=
-                       for i in "$PHP_HTTP_LIBEVENT_DIR" /usr/local /usr /opt; do
-                               if test -f "$i/include/event.h"; then
-                                       EVENT_DIR=$i
-                                       break
-                               fi
-                       done
-                       if test "x$EVENT_DIR" = "x"; then
-                               AC_MSG_RESULT([not found])
-                               AC_MSG_WARN([continuing without libevent support])
-                               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], [ ])
                        else
-                               AC_MSG_RESULT([found in $EVENT_DIR])
-                               
-                               AC_MSG_CHECKING([for libevent version, roughly])
-                               EVENT_VER="1.1b or lower"
+                               AC_DEFINE([PHP_HTTP_HAVE_EVENT2], [0], [ ])
                                if test -f "$EVENT_DIR/include/evhttp.h" && test -f "$EVENT_DIR/include/evdns.h"; then
                                        if test -f "$EVENT_DIR/include/evrpc.h"; then
                                                EVENT_VER="1.4 or greater"
                                        else
                                                EVENT_VER="1.2 or greater"
                                        fi
+                               else
+                                       EVENT_VER="1.1b or lower"
                                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])
                        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])
+               fi
        fi
 
+dnl ----
+dnl RAPHF
+dnl ----
+       HTTP_HAVE_PHP_EXT([raphf], [
+               AC_MSG_CHECKING([for php_raphf.h])
+               HTTP_EXT_RAPHF_INCDIR=
+               for i in `echo $INCLUDES | $SED -e's/-I//g'` $abs_srcdir ../raphf; do
+                       if test -d $i; then
+                               if test -f $i/php_raphf.h; then
+                                       HTTP_EXT_RAPHF_INCDIR=$i
+                                       break
+                               elif test -f $i/ext/raphf/php_raphf.h; then
+                                       HTTP_EXT_RAPHF_INCDIR=$i/ext/raphf
+                                       break
+                               fi
+                       fi
+               done
+               if test "x$HTTP_EXT_RAPHF_INCDIR" = "x"; then
+                       AC_MSG_ERROR([not found])
+               else
+                       AC_MSG_RESULT([$HTTP_EXT_RAPHF_INCDIR])
+                       AC_DEFINE([PHP_HTTP_HAVE_PHP_RAPHF_H], [1], [Have ext/raphf support])
+                       PHP_ADD_INCLUDE([$HTTP_EXT_RAPHF_INCDIR])
+               fi
+       ], [
+               AC_MSG_ERROR([Please install pecl/raphf and activate extension=raphf.$SHLIB_DL_SUFFIX_NAME in your php.ini])
+       ])
+
+dnl ----
+dnl PROPRO
+dnl ----
+       HTTP_HAVE_PHP_EXT([propro], [
+               AC_MSG_CHECKING([for php_propro.h])
+               HTTP_EXT_PROPRO_INCDIR=
+               for i in `echo $INCLUDES | $SED -e's/-I//g'` $abs_srcdir ../propro; do
+                       if test -d $i; then
+                               if test -f $i/php_propro.h; then
+                                       HTTP_EXT_PROPRO_INCDIR=$i
+                                       break
+                               elif test -f $i/ext/propro/php_propro.h; then
+                                       HTTP_EXT_PROPRO_INCDIR=$i/ext/propro
+                                       break
+                               fi
+                       fi
+               done
+               if test "x$HTTP_EXT_PROPRO_INCDIR" = "x"; then
+                       AC_MSG_ERROR([not found])
+               else
+                       AC_MSG_RESULT([$HTTP_EXT_PROPRO_INCDIR])
+                       AC_DEFINE([PHP_HTTP_HAVE_PHP_PROPRO_H], [1], [Have ext/propro support])
+                       PHP_ADD_INCLUDE([$HTTP_EXT_PROPRO_INCDIR])
+               fi
+       ], [
+               AC_MSG_ERROR([Please install pecl/propro and activate extension=propro.$SHLIB_DL_SUFFIX_NAME in your php.ini])
+       ])
+
 PHP_ARG_WITH([http-shared-deps], [whether to depend on extensions which have been built shared],
 [  --without-http-shared-deps   HTTP: do not depend on extensions like hash
                                      and iconv (when they are built shared)], $PHP_HTTP, $PHP_HTTP)
@@ -401,13 +456,7 @@ dnl ----
                php_http_buffer.c \
                php_http.c \
                php_http_client.c \
-               php_http_curl_client.c \
-               php_http_client_datashare.c \
-               php_http_curl_client_datashare.c \
-               php_http_client_factory.c \
-               php_http_client_interface.c \
-               php_http_client_pool.c \
-               php_http_curl_client_pool.c \
+               php_http_client_curl.c \
                php_http_client_request.c \
                php_http_client_response.c \
                php_http_cookie.c \
@@ -420,7 +469,7 @@ dnl ----
                php_http_exception.c \
                php_http_filter.c \
                php_http_header_parser.c \
-               php_http_headers.c \
+               php_http_header.c \
                php_http_info.c \
                php_http_message_body.c \
                php_http_message.c \
@@ -428,11 +477,9 @@ dnl ----
                php_http_misc.c \
                php_http_negotiate.c \
                php_http_object.c \
+               php_http_options.c \
                php_http_params.c \
-               php_http_persistent_handle.c \
-               php_http_property_proxy.c \
                php_http_querystring.c \
-               php_http_resource_factory.c \
                php_http_strlist.c \
                php_http_url.c \
                php_http_version.c \
@@ -444,6 +491,10 @@ dnl ----
        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_HTTP_HEADERS="
@@ -470,7 +521,7 @@ dnl ----
                php_http_filter.h \
                php_http.h \
                php_http_header_parser.h \
-               php_http_headers.h \
+               php_http_header.h \
                php_http_info.h \
                php_http_message_body.h \
                php_http_message.h \
@@ -478,11 +529,9 @@ dnl ----
                php_http_misc.h \
                php_http_negotiate.h \
                php_http_object.h \
+               php_http_options.h \
                php_http_params.h \
-               php_http_persistent_handle.h \
-               php_http_property_proxy.h \
                php_http_querystring.h \
-               php_http_resource_factory.h \
                php_http_strlist.h \
                php_http_url.h \
                php_http_version.h \