Merge branch 'DEV_2' into HEAD

[m6w6/ext-http] / config9.m4

diff --git a/config9.m4 b/config9.m4
index dbceef3e73af296bcab462b4c71111364d898515..aff67ca6656c71463addfca0f9fd68f82c09741e 100644 (file)
--- a/config9.m4
+++ b/config9.m4
@@ -100,7 +100,9 @@ dnl ----
        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
@@ -129,40 +131,6 @@ dnl ----
                fi
        fi
        
-dnl ----
-dnl SERF
-dnl ----
-dnl
-dnl    if test "$PHP_HTTP_LIBSERF_DIR" = "no"; then
-dnl            AC_DEFINE([PHP_HTTP_HAVE_SERF], [0], [ ])
-dnl    else
-dnl            AC_MSG_CHECKING([for serf-?/serf.h])
-dnl            SERF_DIR=
-dnl            for i in "$PHP_HTTP_LIBSERF_DIR" /usr/local /usr /opt; do
-dnl                    if test -f "$i/include/serf-0/serf.h"; then
-dnl                            SERF_DIR=$i
-dnl                            SERF_VER=0
-dnl                            break
-dnl                    elif test -f "$i/include/serf-1/serf.h"; then
-dnl                            SERF_DIR=$i
-dnl                            SERF_VER=1
-dnl                    fi
-dnl            done
-
-dnl            if test "x$SERF_DIR" = "x"; then
-dnl                    AC_MSG_RESULT([not found])
-dnl                    AC_DEFINE([PHP_HTTP_HAVE_SERF], [0], [ ])
-dnl            else
-dnl                    AC_MSG_RESULT([found in $SERF_DIR])
-
-dnl                    PHP_ADD_INCLUDE($SERF_DIR/include/serf-$SERF_VER)
-dnl                    PHP_ADD_LIBRARY_WITH_PATH(serf-$SERF_VER, $SERF_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
-dnl                    AC_DEFINE([PHP_HTTP_HAVE_SERF], [1], [Have libserf support])
-dnl                    HTTP_HAVE_A_REQUEST_LIB=true
-dnl            fi
-dnl    fi
-dnl    
-
 dnl ----
 dnl CURL
 dnl ----
@@ -198,7 +166,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])
@@ -339,7 +311,7 @@ dnl ----
                                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_DEFINE([PHP_HTTP_HAVE_EVENT2], [0], [ ])
@@ -462,13 +434,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 \
@@ -481,7 +447,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 \
@@ -533,7 +499,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 \