# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: kinkie@squid-cache.org-20100811144727-z0ht17h2x9ztv4ue
# target_branch: file:///home/kinkie/squid/workspace/squid-trunk-co/
# testament_sha1: d30ee54e6a4939a3ef2e9623273cefaac698f36e
# timestamp: 2010-08-11 16:48:39 +0200
# base_revision_id: kinkie@squid-cache.org-20100807142254-\
#   w0wevqta0eqse03j
# 
# Begin patch
=== modified file 'test-suite/buildtests/layer-02-maximus.opts'
--- test-suite/buildtests/layer-02-maximus.opts	2010-07-21 02:40:18 +0000
+++ test-suite/buildtests/layer-02-maximus.opts	2010-08-11 14:47:27 +0000
@@ -94,7 +94,6 @@
 	--enable-translation \
 	--enable-zph-qos \
 	--enable-esi \
- \
 	--with-aio \
 	--with-build-environment=default \
 	--with-dl \
@@ -105,6 +104,41 @@
 	--with-pic \
 	--with-pthreads \
 	"
+case $(uname -s) in
+  Linux) 
+    OPTS="$OPTS \
+    --enable-epoll \
+    --enable-linux-netfilter \
+    --with-libcap \
+    --with-valgrind-debug \
+    "
+  ;;
+  SunOS)
+    OPTS="$OPTS \
+    --enable-ipf-transparent \
+    "
+  ;;
+  OpenBSD)
+    OPTS="$OPTS \
+    --enable-pf-transparent \
+    "
+  ;;
+  FreeBSD)
+    OPTS="$OPTS \
+    --enable-kqueue \
+    --enable-ipfw-transparent \
+    "
+  ;;
+  NetBSD)
+  ;;
+  CYGWIN_NT*)
+    OPTS="$OPTS \
+    --enable-win32-service \
+    "
+
+
+  ;;
+esac
 
 # Fix the distclean testing.
 export DISTCHECK_CONFIGURE_FLAGS="${OPTS}"

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVZUBy0AAgDfgEAQVXP//1+l
zKS////wUARYl40WjUq2zasJJE1MVPZMjCmJpjTSAT0myE0NHqNNMhzAJgJkYARiYmEwmCGmJpgJ
FEaA0mhE0fqaQaeo9IYBAZonqPUBzAJgJkYARiYmEwmCGmJpgJKaTEEzQIBT1GjYiNAA0AGhpASm
0UUYYZdT8O0s4ukSuxReF+o8GrlYNUPiqcIhllAKuPPF0aHNILWJBSklj9pwzGm1pvGRuoqzQ0xh
hCUI0O9Lga2snavv1kXtZ+fLGny0/2jzbf06aXY8W4sT5XBNrRq/mrTooYdGzO3JDs9bxGaZGVxf
m3nS1/vR6VoM2k2wU4iTmSO5u1KwPVujE9+quFW2L3bQSd6suOYXI46E0iZs98TtRr4eWpK16Ypt
MYmInOPI7jwGhV1kWBtg4FvLHlj3RMTs7l3i6tyjhiipjGuiZMRN82qIxFJ4ue5nY3lfbUoibIrg
nHAXvnqKzzky7KoltnmhZM3KSvJaRiS6CFIqjOQ4IkguY1gWUUNqqHGaFr9kZiLplBT4ks7CeRZB
PjyEDeUkBjvFylr5Ym+o7Wszv0FslA4ENxBRNZqtWZSxWSKszeWIhTJhQcY0Bg6gWIxJViocTlAF
S4eQeRjgMUmkibyq7I0UjW55kjIVzLZdaOMSieUhDcLXOJuXgXMLwY60dmOMamN1b2uYe1nmZuWN
MCThFwaC9gx0W9+JgpVx3788f5uh80fFE4m8R4IYZF6f7f4R7f2ISirlViGt78sEODYdR4xpR9iR
duwvOgcQLw3+Uq3UQRLvmQYHxcVqZcFnpCb5JX7sbn86IcC07TuPM8kjgOkzkUvxOWj50h7nNy3c
YpRIpErx5ZtPiaSKiQTUGBSi6zeV7Lri/bB8N7JyWi5Ic+NcTz2k4Ul9WI+xUIy5Sl1EAp1nlMW2
SuIaVlXVLWlAJ8kyH0qvNW5Pq1OB2S3X2kXOOrVtmB81BR1x0HiNxRsOs5dfAxIu+uXTO7B6alqp
4xSOq8Wn1w8jegqx+YGSJvnpFLkUs78et+yvIkeKPyIlMFxONYQOa2LopqCdDCO7/YeCMdQHMzAn
oOmFXBNlkvi0RaH7v0HEcmpmJyZQg159EmNu2SUdurZuePBzBVzFa2T1VmMi+VRnO+pFLbZThAIJ
Q1GuskiU2wzhD1IBnIcjju4mGd9EQOxoI/KkhyRSFL1JNh7R9GdNbbYoEPvglCrIYKsVk0w2yVdd
ci2rqpSH1MiNmD41Wrkoi2VyoMfTbUyfPOkNJh3xBPFYHCMgyl0RUSbWZYSiMbzjjsXHUy4yAdti
2KX+SLQpCtih74Kz3Cv5wKY+kmqZvolbpOxw+qRfwILLjoC5aE4HC2QKmrJe4XJTWPB6zBhok0h3
5G7qjwclrwHiuZW2pFdC4pyjmTl5habFWqJOgMm7SCqE1pH9Rf8XckU4UJBWVAct