34 lines
992 B
Diff
34 lines
992 B
Diff
|
From 9668f0d5ecd2382fd36b7ff6a3a29abd04f6533f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Samuel Martin <s.martin49@gmail.com>
|
||
|
|
Date: Fri, 14 Jul 2017 11:50:08 +0200
|
||
|
|
Subject: [PATCH] auto/lib/conf: fix PCRE condition WRT the http and
|
||
|
|
http_rewrite options
|
||
|
|
|
||
|
|
http_rewrite module cannot be selected when http server is disabled, so
|
||
|
|
fix the PCRE check condition to avoid irrelevant check failure.
|
||
|
|
|
||
|
|
Fixes:
|
||
|
|
http://autobuild.buildroot.net/results/bc7/bc7458b97a88785653845afd30fe9d5f3a69905b/build-end.log
|
||
|
|
|
||
|
|
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
|
||
|
|
---
|
||
|
|
auto/lib/conf | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/auto/lib/conf b/auto/lib/conf
|
||
|
|
index 0b8545a3..2c7af104 100644
|
||
|
|
--- a/auto/lib/conf
|
||
|
|
+++ b/auto/lib/conf
|
||
|
|
@@ -7,7 +7,7 @@ if [ $USE_PCRE = YES -o $PCRE != NONE ]; then
|
||
|
|
. auto/lib/pcre/conf
|
||
|
|
|
||
|
|
else
|
||
|
|
- if [ $USE_PCRE = DISABLED -a $HTTP_REWRITE = YES ]; then
|
||
|
|
+ if [ $USE_PCRE = DISABLED -a $HTTP = YES -a $HTTP_REWRITE = YES ]; then
|
||
|
|
|
||
|
|
cat << END
|
||
|
|
|
||
|
|
--
|
||
|
|
2.13.2
|
||
|
|
|