- using Accept-Encoding header instead of CURLOPT_ENCODING avoids issues with curl...

[m6w6/ext-http] / config.m4

diff --git a/config.m4 b/config.m4
index 8d033b173253811189181f13d1ae68b04d23e401..bf19c2418424870dc919c62d4d8e3748c14fa40b 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -16,7 +16,11 @@ PHP_ARG_WITH([http-zlib-compression], [whether to enable support for gzencoded/d
 
 if test "$PHP_HTTP" != "no"; then
 
 
 if test "$PHP_HTTP" != "no"; then
 

-       AC_PROG_EGREP
+       ifdef([AC_PROG_EGREP], [
+               AC_PROG_EGREP
+       ], [
+               AC_CHECK_PROG(EGREP, egrep, egrep)
+       ])

        ifdef([AC_PROG_SED], [
                AC_PROG_SED
        ], [
        ifdef([AC_PROG_SED], [
                AC_PROG_SED
        ], [


@@ -98,11 +102,6 @@ dnl ----
                
                CURL_LIBS=`$CURL_CONFIG --libs`
                
                
                CURL_LIBS=`$CURL_CONFIG --libs`
                

-               CURL_ZLIB=`$CURL_CONFIG --features | $EGREP libz`
-               if test "$CURL_ZLIB" = "libz"; then
-                       AC_DEFINE([HTTP_HAVE_CURL_ZLIB], [1], [ ])
-               fi
-               

                AC_MSG_CHECKING([for SSL support in libcurl])
                CURL_SSL=`$CURL_CONFIG --features | $EGREP SSL`
                if test "$CURL_SSL" = "SSL"; then
                AC_MSG_CHECKING([for SSL support in libcurl])
                CURL_SSL=`$CURL_CONFIG --features | $EGREP SSL`
                if test "$CURL_SSL" = "SSL"; then