# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: kinkie@squid-cache.org-20080822203654-ro4o8ppeiav95hcn
# target_branch: http://www.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: d094b02257115a76d3417c1b2484e1e49c1930c7
# timestamp: 2008-08-22 22:37:41 +0200
# base_revision_id: squid3@treenet.co.nz-20080819083732-\
#   5287nm2db3vjc090
# 
# Begin patch
=== modified file 'configure.in'
--- configure.in	2008-08-12 12:59:50 +0000
+++ configure.in	2008-08-22 20:36:54 +0000
@@ -389,8 +389,7 @@
     aufs_io_threads=$withval
     ;;
   *)
-    echo "ERROR: Invalid --with-aufs-threads argument"
-    exit 1
+    AC_MSG_ERROR(--with-aufs-threads expects a numeric argument)
     ;;
   esac
 ])
@@ -450,8 +449,7 @@
 	if test -d $srcdir/src/fs/$module; then
 	    :
 	else
-	    echo "ERROR: storeio $module does not exists"
-	    exit 1
+	    AC_MSG_ERROR(storeio $module does not exist)
 	fi
     done
     echo "Store modules built: $STORE_MODULES"
@@ -558,8 +556,7 @@
 	if test -d $srcdir/src/DiskIO/$module; then
 	    :
 	else
-	    echo "ERROR: disk-io $module does not exists"
-	    exit 1
+	    AC_MSG_ERROR(disk-io $module does not exist)
 	fi
     done
     DISK_LIBS="lib`echo $DISK_MODULES|sed -e 's% %.a lib%g'`.a"
@@ -688,8 +685,7 @@
 	if test -d $srcdir/src/repl/$module; then
 	    :
 	else
-	    echo "ERROR: Removal policy $module does not exists"
-	    exit 1
+	    AC_MSG_ERROR(Removal policy $module does not exist)
 	fi
     done
     echo "Removal policies built: $REPL_POLICIES"
@@ -1041,7 +1037,7 @@
 dnl Size of COSS memory buffer
 AC_ARG_WITH(coss-membuf-size,
 [  --with-coss-membuf-size COSS membuf size (default 1048576 bytes) ],
-[  if test "$with_coss_membuf_size"; then
+[  if test -n "$withval" -a "x$withval" != "xno" ; then
       echo "Setting COSS membuf size to $with_coss_membuf_size bytes"
       AC_DEFINE_UNQUOTED(COSS_MEMBUF_SZ, $with_coss_membuf_size,[Define if you want to set the COSS membuf size])
    fi
@@ -1201,7 +1197,7 @@
 
 AC_ARG_WITH(large-files,
 [  --with-large-files      Enable support for large files (logs etc).],
-[ if test "$withval" = yes; then
+[ if test "x$withval" = "xyes"; then
 	needlargefiles=1
   fi
 ])
@@ -1255,8 +1251,7 @@
 	if test "`getconf _$buildmodel 2>/dev/null || true`" = 1 || test "`getconf $buildmodel 2>/dev/null || true`" ; then
 	    : # All fine
 	else
-	    echo "ERROR: Build environment $buildmodel not known to getconf."
-	    exit 1
+	    AC_MSG_ERROR(Build environment $buildmodel not known to getconf.)
 	fi
 	CFLAGS="`getconf ${buildmodel}_CFLAGS` $CFLAGS"
 	CXXFLAGS="`getconf ${buildmodel}_CFLAGS` $CXXFLAGS"
@@ -1444,8 +1439,7 @@
 	if test -d $srcdir/src/auth/$module; then
 	    :
 	else
-	    echo "ERROR: Auth scheme $module does not exists"
-	    exit 1
+	    AC_MSG_ERROR(Auth scheme $module does not exist)
 	fi
 	eval AUTH_MODULE_${module}=yes
     done
@@ -1508,8 +1502,7 @@
 		    ;;
 	    esac
 	else
-	    echo "ERROR: Basic auth helper $helper does not exists"
-	    exit 1
+	    AC_MSG_ERROR(Basic auth helper $helper does not exist)
 	fi
     done
     echo "Basic auth helpers built: $BASIC_AUTH_HELPERS"
@@ -1552,8 +1545,7 @@
 	if test -d $srcdir/helpers/ntlm_auth/$helper; then
 	    :
 	else
-	    echo "ERROR: NTLM Auth helper $helper does not exists"
-	    exit 1
+	    AC_MSG_ERROR(NTLM Auth helper $helper does not exist)
 	fi
     done
     echo "NTLM auth helpers built: $NTLM_AUTH_HELPERS"
@@ -1596,8 +1588,7 @@
 	if test -d $srcdir/helpers/negotiate_auth/$helper; then
 	    :
 	else
-	    echo "ERROR: Negotiate Auth helper $helper does not exists"
-	    exit 1
+	    AC_MSG_ERROR(Negotiate Auth helper $helper does not exist)
 	fi
     done
     echo "Negotiate auth helpers built: $NEGOTIATE_AUTH_HELPERS"
@@ -1640,8 +1631,7 @@
 	if test -f $srcdir/helpers/digest_auth/$helper/Makefile.in; then
 		:
 	else
-		echo "ERROR: digest auth helper $helper does not exists"
-		exit 1
+		AC_MSG_ERROR(digest auth helper $helper does not exist)
 	fi
     done
     echo "Digest auth helpers built: $DIGEST_AUTH_HELPERS"
@@ -1692,8 +1682,7 @@
 	if test -f $srcdir/helpers/external_acl/$helper/Makefile.in; then
 		:
 	else
-		echo "ERROR: external acl helper $helper does not exists"
-		exit 1
+		AC_MSG_ERROR(external acl helper $helper does not exist)
 	fi
     done
     echo "External acl helpers built: $EXTERNAL_ACL_HELPERS"
@@ -1758,8 +1747,7 @@
 			echo "using SASL"
 			LIBSASL="-lsasl"
 		else
-			echo "ERROR: Neither SASL nor SASL2 found"
-			exit 1
+			AC_MSG_ERROR(Neither SASL nor SASL2 found)
 		fi
 	fi
 	AC_SUBST(LIBSASL)
@@ -1980,7 +1968,16 @@
 AC_ARG_WITH(filedescriptors,
 [  --with-filedescriptors=NUMBER
                           Force squid to support NUMBER filedescriptors],
-[ squid_filedescriptors_num=$withval ])
+[ 
+  case ${withval} in
+    [[0-9]]*)
+      squid_filedescriptors_num=$withval
+      ;;
+    *)
+      AC_MSG_ERROR(--with-filedescriptors expects a numeric argument)
+      ;;
+    esac
+])
 
 AC_PATH_PROG(CPPUNITCONFIG, cppunit-config, false)
 if $CPPUNITCONFIG --help >/dev/null; then
@@ -2004,15 +2001,14 @@
 	echo "Using cppunit includes from $withval"
 	SQUID_CPPUNIT_INC="-I${withval}/include"
     else
-	echo "ERROR: Cannot find cppunit at $withval"
-	exit 1
+	AC_MSG_ERROR(Cannot find cppunit at $withval)
     fi
   if test -f $withval/lib/libcppunit.la; then
 	echo "Using cppunit lib from $withval"
 	SQUID_CPPUNIT_LA="${withval}/lib/libcppunit.la"
 	SQUID_CPPUNIT_LIBS='$(SQUID_CPPUNIT_LA)'
     else
-	echo "ERROR: Cannot find cppunit at $withval"
+	AC_MSG_ERROR(Cannot find cppunit at $withval)
 	exit 1
     fi
 ])

=== modified file 'test-suite/buildtests/layer-01-minimal.opts'
--- test-suite/buildtests/layer-01-minimal.opts	2008-08-09 13:54:43 +0000
+++ test-suite/buildtests/layer-01-minimal.opts	2008-08-22 20:36:54 +0000
@@ -10,6 +10,16 @@
 # 	grep -E "^AC_ARG_WITH" ./configure.in | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >without.opts
 # followed by insertion of '	--without-' and ' \' strings
 #
+# sometimes it's just too automatic.. Following options should be just stripped
+#
+#   --without-default-user \
+#   --without-aufs-threads \
+#   --without-coss-membuf-size \
+#   --without-filedescriptors \
+#   --without-cppunit-basedir \
+#   --without-build-environment \
+#
+#
 OPTS=" \
 	--disable-loadable-modules \
 	--disable-gnuregex \
@@ -70,21 +80,15 @@
 	--disable-zph-qos \
 	--disable-auto-locale \
  \
-	--without-default-user \
-	--without-aufs-threads \
 	--without-pthreads \
 	--without-aio \
 	--without-dl \
 	--without-openssl \
-	--without-coss-membuf-size \
 	--without-large-files \
-	--without-build-environment \
 	--without-valgrind-debug \
 	--without-ipv6-split-stack \
 	--without-ipv4-mapped \
 	--without-localhost-ipv6 \
 	--without-dns-cname \
-	--without-filedescriptors \
-	--without-cppunit-basedir \
 	--without-po2html \
 	"

# Begin bundle
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
wj0YmhEKhXN0f+LuSKcKEh/R0f0g