X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=autoconf%2Fpecl%2Fpecl.m4;h=a1df4f02fd062cc2ed8e5cbfad7bba1bbbc75279;hb=528ff3300e7906cbce672795b6e65da6b584ba16;hp=6721e1c1455f68bf2d01c0bb0c173792aaa72f7e;hpb=e0fd24ca37f96c144242a5da6378b68ff3debbe9;p=m6w6%2Fext-http

diff --git a/autoconf/pecl/pecl.m4 b/autoconf/pecl/pecl.m4
index 6721e1c..a1df4f0 100644
--- a/autoconf/pecl/pecl.m4
+++ b/autoconf/pecl/pecl.m4
@@ -332,8 +332,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])