fix custom version checks

diff --git a/autoconf/pecl/pecl.m4 b/autoconf/pecl/pecl.m4
index 8822605af2e546dded589754ad7975aaf98bff4a..7991e4c20f6d88d9fdd57933e43e3c6f0987efc2 100644 (file)
--- a/autoconf/pecl/pecl.m4
+++ b/autoconf/pecl/pecl.m4
@@ -255,7 +255,9 @@ AC_DEFUN([PECL_CHECK_CUSTOM], [
                LIBS="-l$4"
 
                AC_CACHE_VAL(PECL_CACHE_VAR([$1_version]), [
                LIBS="-l$4"
 
                AC_CACHE_VAL(PECL_CACHE_VAR([$1_version]), [

+                       pushd $PECL_CACHE_VAR([$1_prefix]) 

                        PECL_CACHE_VAR([$1_version])=$5
                        PECL_CACHE_VAR([$1_version])=$5

+                       popd

                ])
                PECL_CHECKED_VERSION([$1])=$PECL_CACHE_VAR([$1_version])
                
                ])
                PECL_CHECKED_VERSION([$1])=$PECL_CACHE_VAR([$1_version])
                

diff --git a/config9.m4 b/config9.m4
index c5e3d419bb42a4e035d66e58b1d3b29efabcb095..0b31e0be6da9ccea8d7b467f6801db4c5cda3cb1 100644 (file)
--- a/config9.m4
+++ b/config9.m4
@@ -58,7 +58,7 @@ if test "$PHP_HTTP" != "no"; then
        [  --with-http-libidn2-dir[=DIR]      HTTP: where to find libidn2], $PHP_HTTP_LIBCURL_DIR, no)
        if test "$PHP_HTTP_LIBIDN2_DIR" != "no"; then
                PECL_CHECK_CUSTOM(libidn2, "$PHP_HTTP_LIBIDN2_DIR", idn2.h, idn2, 
        [  --with-http-libidn2-dir[=DIR]      HTTP: where to find libidn2], $PHP_HTTP_LIBCURL_DIR, no)
        if test "$PHP_HTTP_LIBIDN2_DIR" != "no"; then
                PECL_CHECK_CUSTOM(libidn2, "$PHP_HTTP_LIBIDN2_DIR", idn2.h, idn2, 

-                       [$($EGREP "define IDN2_VERSION " "$path/include/idn2.h" | $SED -e's/^.*VERSION //g' -e 's/@<:@^0-9\.@:>@//g')])
+                       [$($EGREP "define IDN2_VERSION " "include/idn2.h" | $SED -e's/^.*VERSION //g' -e 's/@<:@^0-9\.@:>@//g')])

                if $PECL_VAR([HAVE_LIBIDN2]); then
                        PECL_DEFINE([HAVE_IDNA2008])
                fi
                if $PECL_VAR([HAVE_LIBIDN2]); then
                        PECL_DEFINE([HAVE_IDNA2008])
                fi


@@ -120,7 +120,7 @@ if test "$PHP_HTTP" != "no"; then
        [  --with-http-libidnkit2-dir[=DIR]   HTTP: where to find libidnkit2], $PHP_HTTP_LIBCURL_DIR, no)
        if test "$PHP_HTTP_LIBIDNKIT2_DIR" != "no"; then
                PECL_CHECK_CUSTOM(libidnkit2, "$PHP_HTTP_LIBIDNKIT2_DIR", idn/api.h, idnkit,
        [  --with-http-libidnkit2-dir[=DIR]   HTTP: where to find libidnkit2], $PHP_HTTP_LIBCURL_DIR, no)
        if test "$PHP_HTTP_LIBIDNKIT2_DIR" != "no"; then
                PECL_CHECK_CUSTOM(libidnkit2, "$PHP_HTTP_LIBIDNKIT2_DIR", idn/api.h, idnkit,

-                       [$($EGREP "define IDNKIT_VERSION_LIBIDN\b" "$path/include/idn/version.h" | $SED -e's/^.*VERSION_LIBIDN//g' -e 's/@<:@^0-9\.@:>@//g')])
+                       [$($EGREP "define IDNKIT_VERSION_LIBIDN\b" "include/idn/version.h" | $SED -e's/^.*VERSION_LIBIDN//g' -e 's/@<:@^0-9\.@:>@//g')])

                if $PECL_VAR([HAVE_LIBIDNKIT2]); then
                        PECL_DEFINE([HAVE_IDNA2008])
                fi
                if $PECL_VAR([HAVE_LIBIDNKIT2]); then
                        PECL_DEFINE([HAVE_IDNA2008])
                fi


@@ -135,7 +135,7 @@ if test "$PHP_HTTP" != "no"; then
                        AC_MSG_WARN([libidnkit-$PECL_VAR([LIBIDNKIT2_VERSION]) already enabled, skipping libidnkit1])
                else
                        PECL_CHECK_CUSTOM(libidnkit, "$PHP_HTTP_LIBIDNKIT_DIR", idn/api.h, idnkit,
                        AC_MSG_WARN([libidnkit-$PECL_VAR([LIBIDNKIT2_VERSION]) already enabled, skipping libidnkit1])
                else
                        PECL_CHECK_CUSTOM(libidnkit, "$PHP_HTTP_LIBIDNKIT_DIR", idn/api.h, idnkit,

-                               [$($EGREP "define IDNKIT_VERSION\b" "$path/include/idn/version.h" | $SED -e's/^.*VERSION//g' -e 's/@<:@^0-9\.@:>@//g')])
+                               [$($EGREP "define IDNKIT_VERSION\b" "include/idn/version.h" | $SED -e's/^.*VERSION//g' -e 's/@<:@^0-9\.@:>@//g')])

                        if $PECL_VAR([HAVE_LIBIDNKIT]); then
                                PECL_DEFINE([HAVE_IDNA2003])
                        fi
                        if $PECL_VAR([HAVE_LIBIDNKIT]); then
                                PECL_DEFINE([HAVE_IDNA2003])
                        fi