PHP_CHECK_FUNC(gethostname, nsl)
PHP_CHECK_FUNC(getdomainname, nsl)
PHP_CHECK_FUNC(getservbyport, nsl)
+ PHP_CHECK_FUNC(getservbyport_r, nsl)
PHP_CHECK_FUNC(getservbyname, nsl)
+ PHP_CHECK_FUNC(getservbyname_r, nsl)
dnl ----
dnl ZLIB
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 ----
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])
AC_MSG_CHECKING([for libevent version, roughly])
if test -f "$EVENT_DIR/include/event2/event.h"; then
- EVENT_VER="`$EGREP _EVENT_VERSION $EVENT_DIR/include/event2/event.h | $AWK '{print $3}'`"
+ EVENT_VER="`$EGREP _EVENT_VERSION $EVENT_DIR/include/event2/event-config.h | $AWK '{print $3}'`"
AC_DEFINE([PHP_HTTP_HAVE_EVENT2], [1], [ ])
else
- AC_DEFFINE([PHP_HTTP_HAVE_EVENT2], [0], [ ])
+ 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"
])
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
+ ])
+
+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
+ ])
+
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)
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 \
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 \
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 \
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="
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 \
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 \
projects / m6w6 / ext-http / blobdiff