- less custom macro cruft

[m6w6/ext-http] / config9.m4

diff --git a/config9.m4 b/config9.m4
index e32d14660864a7a48016764e29e31c3273c41086..ea6c692a3f2ae2e9d001f89301517fc8f454d990 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(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, nsl)

+       PHP_CHECK_FUNC(getservbyname_r, nsl)

 
 dnl ----
 dnl ZLIB
 
 dnl ----
 dnl ZLIB


@@ -129,40 +131,6 @@ dnl ----
                fi
        fi
        
                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 ----
 dnl ----
 dnl CURL
 dnl ----