From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 21 Mar 2014 13:48:22 +0000 (+0100)
Subject: Merge remote-tracking branch 'stevee/squid-zph-qos' into beyond-next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=4c7bfb1f271bdd0de493772a15209e038344e57c;hp=6bd4bcdaa12cc7a3111d6a9c26ab6cd1124c618a

Merge remote-tracking branch 'stevee/squid-zph-qos' into beyond-next
---

diff --git a/lfs/squid b/lfs/squid
index 7c27fb41e..00dc12a10 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -117,7 +117,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--enable-kill-parent-hack \
 		--disable-wccpv2 \
 		--enable-icap-client \
-		--disable-esi
+		--disable-esi \
+		--enable-zph-qos
 
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install