Merge branch 'v2.6.x'

[m6w6/ext-http] / autoconf / pecl / pecl.m4

diff --git a/autoconf/pecl/pecl.m4 b/autoconf/pecl/pecl.m4
index 9ab9aed32da5e1a326fe79d45f0a79dbf868721f..e6cd7921d35b367c69d24de21cc479468c7980f4 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]), [
+                       pushd $PECL_CACHE_VAR([$1_prefix]) >/dev/null
                        PECL_CACHE_VAR([$1_version])=$5
+                       popd >/dev/null
                ])
                PECL_CHECKED_VERSION([$1])=$PECL_CACHE_VAR([$1_version])
 
@@ -266,6 +268,8 @@ AC_DEFUN([PECL_CHECK_CUSTOM], [
                else
                        PECL_VAR([HAVE_$1])=false
                fi
+       else
+               PECL_VAR([HAVE_$1])=false
        fi
        AC_MSG_RESULT([${PECL_CHECKED_VERSION([$1]):-no}])
 ])