X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=autoconf%2Fpecl%2Flibbrotli.m4;h=575f635111c0fc813a91d6bf7264e4ba760538e5;hp=6d9a80edf73e24b7d84cd42d7078a5f9d03f5d18;hb=ef9c474299e45b4d952b6a821b11f5121624a5fc;hpb=e3386e9e65eaf7a682ddacbbc3c44ddcd737168f

diff --git a/autoconf/pecl/libbrotli.m4 b/autoconf/pecl/libbrotli.m4
index 6d9a80e..575f635 100644
--- a/autoconf/pecl/libbrotli.m4
+++ b/autoconf/pecl/libbrotli.m4
@@ -1,5 +1,11 @@
 
 AC_DEFUN([PECL_CHECK_LIBBROTLI], [
+	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])
+
 	PECL_CHECK_LIBBROTLI_COMMON([$1], [$2])
 	PECL_CHECK_DONE(libbrotlicommon, [$PECL_VAR([HAVE_LIBBROTLI_COMMON])])
 	PECL_CHECK_LIBBROTLI_DEC([$1], [$2])
@@ -11,6 +17,8 @@ AC_DEFUN([PECL_CHECK_LIBBROTLI], [
 	&& $PECL_VAR([HAVE_LIBBROTLI_DEC]) \
 	&& $PECL_VAR([HAVE_LIBBROTLI_ENC]); then
 		PECL_VAR([HAVE_LIBBROTLI])=true
+	else
+		PECL_VAR([HAVE_LIBBROTLI])=false
 	fi
 ])
 
@@ -20,7 +28,6 @@ AC_DEFUN([PECL_CHECK_LIBBROTLI_COMMON], [
 	PECL_HAVE_VERSION(libbrotlicommon, ifelse($2,,1.0,$2), [
 		PECL_VAR([HAVE_LIBBROTLI_COMMON])=true
 	], [
-		AC_MSG_WARN([skipping libbrotli])
 		PECL_VAR([HAVE_LIBBROTLI_COMMON])=false
 	])
 ])
@@ -31,7 +38,6 @@ AC_DEFUN([PECL_CHECK_LIBBROTLI_DEC], [
 	PECL_HAVE_VERSION(libbrotlidec, ifelse($2,,1.0,$2), [
 		PECL_VAR([HAVE_LIBBROTLI_DEC])=true
 	], [
-		AC_MSG_WARN([skipping libbrotli])
 		PECL_VAR([HAVE_LIBBROTLI_DEC])=false
 	])
 ])
@@ -42,7 +48,6 @@ AC_DEFUN([PECL_CHECK_LIBBROTLI_ENC], [
 	PECL_HAVE_VERSION(libbrotlienc, ifelse($2,,1.0,$2), [
 		PECL_VAR([HAVE_LIBBROTLI_ENC])=true
 	], [
-		AC_MSG_WARN([skipping libbrotli])
 		PECL_VAR([HAVE_LIBBROTLI_ENC])=false
 	])
 ])