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

diff --git a/autoconf/pecl/libbrotli.m4 b/autoconf/pecl/libbrotli.m4
index 8ea8b1f..aee9483 100644
--- a/autoconf/pecl/libbrotli.m4
+++ b/autoconf/pecl/libbrotli.m4
@@ -1,33 +1,52 @@
 
 AC_DEFUN([PECL_CHECK_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
+	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
+	], [
+		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
 	])
 ])
 
 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
 	], [
-		AC_MSG_WARN([skipping libbrotli])
 		PECL_VAR([HAVE_LIBBROTLI_ENC])=false
 	])
 ])