- require libcurl-7.12.3

[m6w6/ext-http] / config.m4

diff --git a/config.m4 b/config.m4
index 9cb097379274c9c36d40b68fdc5b1f526aae6ec3..169aa1561d2b983a9974f13366aa8da28c91503c 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -46,7 +46,7 @@ dnl ----
 dnl CURL
 dnl ----
        if test "$PHP_HTTP_CURL_REQUESTS" != "no"; then
-       
+
                AC_MSG_CHECKING([for curl/curl.h])
                CURL_DIR=
                for i in "$PHP_HTTP_CURL_REQUESTS" /usr/local /usr /opt; do
@@ -77,6 +77,14 @@ dnl ----
                        AC_MSG_RESULT([found: $CURL_CONFIG])
                fi
                
+               dnl Debian stable has currently 7.13.2 (this is not a typo)
+               AC_MSG_CHECKING([for curl version >= 7.12.3])
+               CURL_VERSION=`$CURL_CONFIG --version | $SED -e 's/[[^0-9\.]]//g'`
+               AC_MSG_RESULT([$CURL_VERSION])
+               if test `echo $CURL_VERSION | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71203; then
+                       AC_MSG_ERROR([libcurl version greater or equal to 7.12.3 required])
+               fi
+               
                CURL_LIBS=`$CURL_CONFIG --libs`
                
                CURL_ZLIB=`$CURL_CONFIG --features | $EGREP libz`
@@ -172,23 +180,21 @@ dnl ----
                        fi
                        old_CPPFLAGS=$CPPFLAGS
                        CPPFLAGS=$INCLUDES
-                       AC_CHECK_HEADER([php_hash.h], [
-                               AC_MSG_RESULT(enabled)
-                               AC_DEFINE([HTTP_HAVE_EXT_HASH], [1], [Have ext/hash support])
+                       AC_MSG_RESULT([looking for php_hash.h])
+                       AC_CHECK_HEADER([ext/hash/php_hash.h], [
+                               AC_DEFINE([HTTP_HAVE_EXT_HASH_EXT_HASH], [1], [Have ext/hash support])
                        ], [ 
                                AC_CHECK_HEADER([hash/php_hash.h], [
-                                       AC_MSG_RESULT(enabled)
                                        AC_DEFINE([HTTP_HAVE_HASH_EXT_HASH], [1], [Have ext/hash support])
                                ], [ 
-                                       AC_CHECK_HEADER([ext/hash/php_hash.h], [
-                                        AC_MSG_RESULT(enabled)
-                                               AC_DEFINE([HTTP_HAVE_EXT_HASH_EXT_HASH], [1], [Have ext/hash support])
-                                       ], [
-                                               AC_MSG_RESULT(disabled)
+                       AC_CHECK_HEADER([php_hash.h], [
+                               AC_DEFINE([HTTP_HAVE_EXT_HASH], [1], [Have ext/hash support])
                                        ])
                                ])
                        ])
                        CPPFLAGS=$old_CPPFLAGS;
+               else
+                       AC_MSG_RESULT(disabled)
                fi
        elif test "$PHP_HASH" != "no" && test "x$PHP_HASH" != "x"; then
                AC_MSG_RESULT(enabled)