projects
/
m6w6
/
ext-http
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (from parent 1:
7ebd2a6
)
set AHVE_LIBBROTLI to false if checks fail
author
Michael Wallner
<mike@php.net>
Tue, 27 Feb 2018 14:19:59 +0000
(15:19 +0100)
committer
Michael Wallner
<mike@php.net>
Tue, 27 Feb 2018 14:19:59 +0000
(15:19 +0100)
autoconf/pecl/libbrotli.m4
patch
|
blob
|
history
diff --git
a/autoconf/pecl/libbrotli.m4
b/autoconf/pecl/libbrotli.m4
index 6d9a80edf73e24b7d84cd42d7078a5f9d03f5d18..f8916e2d79cb99fc0e67accb35f9882e0195141e 100644
(file)
--- a/
autoconf/pecl/libbrotli.m4
+++ b/
autoconf/pecl/libbrotli.m4
@@
-11,6
+11,8
@@
AC_DEFUN([PECL_CHECK_LIBBROTLI], [
&& $PECL_VAR([HAVE_LIBBROTLI_DEC]) \
&& $PECL_VAR([HAVE_LIBBROTLI_ENC]); then
PECL_VAR([HAVE_LIBBROTLI])=true
&& $PECL_VAR([HAVE_LIBBROTLI_DEC]) \
&& $PECL_VAR([HAVE_LIBBROTLI_ENC]); then
PECL_VAR([HAVE_LIBBROTLI])=true
+ else
+ PECL_VAR([HAVE_LIBBROTLI])=false
fi
])
fi
])
@@
-20,7
+22,6
@@
AC_DEFUN([PECL_CHECK_LIBBROTLI_COMMON], [
PECL_HAVE_VERSION(libbrotlicommon, ifelse($2,,1.0,$2), [
PECL_VAR([HAVE_LIBBROTLI_COMMON])=true
], [
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
])
])
PECL_VAR([HAVE_LIBBROTLI_COMMON])=false
])
])
@@
-31,7
+32,6
@@
AC_DEFUN([PECL_CHECK_LIBBROTLI_DEC], [
PECL_HAVE_VERSION(libbrotlidec, ifelse($2,,1.0,$2), [
PECL_VAR([HAVE_LIBBROTLI_DEC])=true
], [
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
])
])
PECL_VAR([HAVE_LIBBROTLI_DEC])=false
])
])
@@
-42,7
+42,6
@@
AC_DEFUN([PECL_CHECK_LIBBROTLI_ENC], [
PECL_HAVE_VERSION(libbrotlienc, ifelse($2,,1.0,$2), [
PECL_VAR([HAVE_LIBBROTLI_ENC])=true
], [
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
])
])
PECL_VAR([HAVE_LIBBROTLI_ENC])=false
])
])