X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=autoconf%2Fpecl%2Fpecl.m4;h=ffa45ac03fe88cf746f84378199040747f242ce6;hp=6721e1c1455f68bf2d01c0bb0c173792aaa72f7e;hb=8c68d26868c0605654517d6dc098a2b269e118ae;hpb=f486a14465656df4544ca84a3e0e2730132cce93

diff --git a/autoconf/pecl/pecl.m4 b/autoconf/pecl/pecl.m4
index 6721e1c..ffa45ac 100644
--- a/autoconf/pecl/pecl.m4
+++ b/autoconf/pecl/pecl.m4
@@ -70,6 +70,15 @@ AC_DEFUN([PECL_RESTORE_ENV], [
 	$1=$PECL_SAVE_VAR([$2_$1])
 ])
 dnl
+dnl PECL_EVAL_LIBLINE(libline)
+dnl
+AC_DEFUN([PECL_EVAL_LIBLINE], [
+	PECL_SAVE_ENV(ext_shared, pecl)
+	ext_shared=no
+	PHP_EVAL_LIBLINE([$1], _pecl_eval_libline_dummy)
+	PECL_RESTORE_ENV(ext_shared, pecl)
+])
+dnl
 dnl PECL_PROG_EGREP
 dnl
 dnl Checks for an egrep. Defines $EGREP.
@@ -221,7 +230,7 @@ AC_DEFUN([PECL_HAVE_VERSION], [
 	aversion=_PECL_TR_VERSION([$PECL_CHECKED_VERSION([$1])])
 	mversion=_PECL_TR_VERSION([$2])
 	AC_MSG_CHECKING([whether $1 version $PECL_CHECKED_VERSION([$1]) >= $2])
-	if test "$aversion" -lt "$mversion"; then
+	if test -z "$aversion" || test "$aversion" -lt "$mversion"; then
 		ifelse($4,,AC_MSG_ERROR([no]), [
 			AC_MSG_RESULT([no])
 			$4
@@ -254,7 +263,7 @@ AC_DEFUN([PECL_CHECK_CUSTOM], [
 		CPPFLAGS="-I$PECL_CACHE_VAR([$1_prefix])/include"
 		LDFLAGS="-L$PECL_CACHE_VAR([$1_prefix])/$PHP_LIBDIR"
 		LIBS="-l$4"
-		PHP_EVAL_LIBLINE([$LDFLAGS $LIBS])
+		PECL_EVAL_LIBLINE([$LDFLAGS $LIBS])
 		
 		AC_CACHE_VAL(PECL_CACHE_VAR([$1_version]), [
 			pushd $PECL_CACHE_VAR([$1_prefix]) >/dev/null
@@ -311,8 +320,7 @@ AC_DEFUN([PECL_CHECK_CONFIG], [
 			PECL_CACHE_VAR([$1_libs])=$($2 $6)
 		])
 		LIBS=$PECL_CACHE_VAR([$1_libs])
-		
-		PHP_EVAL_LIBLINE([$LDFLAGS $LIBS])
+		PECL_EVAL_LIBLINE([$LDFLAGS $LIBS])
 	ifelse($2, [$PKG_CONFIG $1], [
 		fi
 	])
@@ -332,8 +340,16 @@ dnl PECL_CHECK_PKGCONFIG(pkg[, additional-pkg-config-path])
 dnl
 AC_DEFUN([PECL_CHECK_PKGCONFIG], [dnl
 	AC_REQUIRE([PECL_PROG_PKGCONFIG])dnl
-	ifelse($2,,,PKG_CONFIG_PATH="$2/lib/pkgconfig:$PKG_CONFIG_PATH")
+	ifelse($2,,, [
+		PECL_SAVE_VAR(pkgconfig_path)="$PKG_CONFIG_PATH"
+		if test -d "$2"; then
+			export PKG_CONFIG_PATH="$2/lib/pkgconfig:$PKG_CONFIG_PATH"
+		fi
+	])
 	PECL_CHECK_CONFIG([$1], [$PKG_CONFIG $1], [--modversion], [--cflags-only-I], [--libs-only-L], [--libs-only-l])
+	ifelse($2,,, [
+		PKG_CONFIG_PATH="$PECL_SAVE_VAR(pkgconfig_path)"
+	])
 ])
 dnl
 dnl PECL_CHECK_DONE(name, success[, incline, libline])