prepare v4.2.5

[m6w6/ext-http] / config9.m4

diff --git a/config9.m4 b/config9.m4
index 89d7b28d6c507b78d1b1f82d89a6c52db4921d6c..35f1af159719e3ebb0a00496a783b091528f2fc4 100644 (file)
--- a/config9.m4
+++ b/config9.m4
@@ -24,7 +24,7 @@ if test "$PHP_HTTP" != "no"; then
                AC_CHECK_LIB(nsl, getdomainname)
        ])
        AC_CHECK_FUNCS(mbrtowc mbtowc iswalnum inet_pton)
-       
+
        CFLAGS="$CFLAGS -Wno-strict-prototypes"
 
        dnl ZLIB
@@ -80,7 +80,16 @@ if test "$PHP_HTTP" != "no"; then
        if test "$PHP_HTTP_LIBIDN_DIR" != "no"; then
                PECL_CHECK_PKGCONFIG(libidn, [$PHP_HTTP_LIBIDN_DIR])
                if $PECL_VAR([HAVE_LIBIDN]); then
-                       PECL_DEFINE([HAVE_IDNA2003])
+                       PECL_HAVE_VERSION(libidn, 1.36, [
+                               PECL_HAVE_VERSION(libidn, 1.39, [
+                                       PECL_DEFINE([HAVE_IDNA2003])
+                               ], [
+                                       PECL_VAR([HAVE_LIBIDN])=false
+                                       AC_MSG_WARN([libidn locale detection broken; disabling libidn support])
+                               ])
+                       ], [
+                               PECL_DEFINE([HAVE_IDNA2003])
+                       ])
                fi
                PECL_CHECK_DONE(libidn, $PECL_VAR([HAVE_LIBIDN]))
        fi
@@ -169,12 +178,6 @@ if test "$PHP_HTTP" != "no"; then
        ], [
                AC_MSG_ERROR([please install and enable pecl/raphf])
        ])
-       PECL_HAVE_PHP_EXT([propro], [
-               PECL_HAVE_PHP_EXT_HEADER([propro])
-       ], [
-               AC_MSG_ERROR([please install and enable pecl/propro])
-       ])
-       PECL_HAVE_PHP_EXT([hash])
        PECL_HAVE_PHP_EXT([iconv])
 
        dnl DONE
@@ -204,7 +207,6 @@ if test "$PHP_HTTP" != "no"; then
                fi
        fi
        PHP_ADD_EXTENSION_DEP([http], [raphf], true)
-       PHP_ADD_EXTENSION_DEP([http], [propro], true)
 
        PHP_SUBST(PECL_VAR([HEADERS]))
        PHP_SUBST(PECL_VAR([SOURCES]))