X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=autoconf%2Fpecl%2Flibbrotli.m4;h=aee94836ee99c6228682b8dd5ea7d7da54d42bbf;hp=f8916e2d79cb99fc0e67accb35f9882e0195141e;hb=HEAD;hpb=ad1dfac848dbbb295151c22b4f6fbcad13ce7a56

diff --git a/autoconf/pecl/libbrotli.m4 b/autoconf/pecl/libbrotli.m4
index f8916e2..aee9483 100644
--- a/autoconf/pecl/libbrotli.m4
+++ b/autoconf/pecl/libbrotli.m4
@@ -6,7 +6,7 @@ AC_DEFUN([PECL_CHECK_LIBBROTLI], [
 	PECL_CHECK_DONE(libbrotlidec, [$PECL_VAR([HAVE_LIBBROTLI_DEC])])
 	PECL_CHECK_LIBBROTLI_ENC([$1], [$2])
 	PECL_CHECK_DONE(libbrotlienc, [$PECL_VAR([HAVE_LIBBROTLI_ENC])])
-	
+
 	if $PECL_VAR([HAVE_LIBBROTLI_COMMON]) \
 	&& $PECL_VAR([HAVE_LIBBROTLI_DEC]) \
 	&& $PECL_VAR([HAVE_LIBBROTLI_ENC]); then
@@ -14,11 +14,16 @@ AC_DEFUN([PECL_CHECK_LIBBROTLI], [
 	else
 		PECL_VAR([HAVE_LIBBROTLI])=false
 	fi
+	dnl config.m4 calls PECL_CHECK_DONE once more
+	PECL_COUNT_CHECKS([+1])
+	PECL_SAVE_ENV([CPPFLAGS], [libbrotli])
+	PECL_SAVE_ENV([LDFLAGS], [libbrotli])
+	PECL_SAVE_ENV([LIBS], [libbrotli])
 ])
 
 AC_DEFUN([PECL_CHECK_LIBBROTLI_COMMON], [
 	PECL_CHECK_PKGCONFIG(libbrotlicommon, [$1])
-	
+
 	PECL_HAVE_VERSION(libbrotlicommon, ifelse($2,,1.0,$2), [
 		PECL_VAR([HAVE_LIBBROTLI_COMMON])=true
 	], [
@@ -28,7 +33,7 @@ AC_DEFUN([PECL_CHECK_LIBBROTLI_COMMON], [
 
 AC_DEFUN([PECL_CHECK_LIBBROTLI_DEC], [
 	PECL_CHECK_PKGCONFIG(libbrotlidec, [$1])
-	
+
 	PECL_HAVE_VERSION(libbrotlidec, ifelse($2,,1.0,$2), [
 		PECL_VAR([HAVE_LIBBROTLI_DEC])=true
 	], [
@@ -38,7 +43,7 @@ AC_DEFUN([PECL_CHECK_LIBBROTLI_DEC], [
 
 AC_DEFUN([PECL_CHECK_LIBBROTLI_ENC], [
 	PECL_CHECK_PKGCONFIG(libbrotlienc, [$1])
-	
+
 	PECL_HAVE_VERSION(libbrotlienc, ifelse($2,,1.0,$2), [
 		PECL_VAR([HAVE_LIBBROTLI_ENC])=true
 	], [