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

diff --git a/autoconf/pecl/libbrotli.m4 b/autoconf/pecl/libbrotli.m4
index 8ea8b1f..575f635 100644
--- a/autoconf/pecl/libbrotli.m4
+++ b/autoconf/pecl/libbrotli.m4
@@ -1,22 +1,43 @@
 
 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])
 	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_DEC]) && $PECL_VAR([HAVE_LIBBROTLI_ENC]); then
+	if $PECL_VAR([HAVE_LIBBROTLI_COMMON]) \
+	&& $PECL_VAR([HAVE_LIBBROTLI_DEC]) \
+	&& $PECL_VAR([HAVE_LIBBROTLI_ENC]); then
 		PECL_VAR([HAVE_LIBBROTLI])=true
+	else
+		PECL_VAR([HAVE_LIBBROTLI])=false
 	fi
 ])
 
+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
+	], [
+		PECL_VAR([HAVE_LIBBROTLI_COMMON])=false
+	])
+])
+
 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
 	], [
-		AC_MSG_WARN([skipping libbrotli])
 		PECL_VAR([HAVE_LIBBROTLI_DEC])=false
 	])
 ])
@@ -27,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
 	])
 ])