SourceFormat Enforcement

[thirdparty/squid.git] / test-suite / buildtests / layer-01-minimal.opts

diff --git a/test-suite/buildtests/layer-01-minimal.opts b/test-suite/buildtests/layer-01-minimal.opts
index 2b2110cfed3936e4fc074ada8cc2a7d054dfdc9e..d3729636c39c4f89d3bc9f4fa4f237590553b090 100644 (file)
--- a/test-suite/buildtests/layer-01-minimal.opts
+++ b/test-suite/buildtests/layer-01-minimal.opts
@@ -1,3 +1,10 @@
+## Copyright (C) 1996-2015 The Squid Software Foundation and contributors
+##
+## Squid software is distributed under GPLv2+ license and includes
+## contributions from numerous individuals and organizations.
+## Please see the COPYING and CONTRIBUTORS files for details.
+##
+
 #
 # Minimal configuration options.
 # - Everthing that can be disabled is
@@ -9,24 +16,27 @@
 MAKETEST="distcheck"
 #
 #
-# The options for this level can be easily generated semi-automatically from configure.in by:
-#      grep -E "^AC_ARG_ENABLE" ./configure.in | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >disable.opts
+# The options for this level can be easily generated semi-automatically from configure.ac by:
+#      grep -E "^AC_ARG_ENABLE" ./configure.ac | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >disable.opts
 # followed by insertion of '   --disable-' and '\' strings
 #
-#      grep -E "^AC_ARG_WITH" ./configure.in | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >without.opts
+#      grep -E "^AC_ARG_WITH" ./configure.ac | 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=" \
+# NP: DISTCHECK_CONFIGURE_FLAGS is a magic automake macro for the 
+#     distcheck target recursive tests beteen scripted runs.
+#     we use it to perform the same duty between our nested scripts.
+DISTCHECK_CONFIGURE_FLAGS=" \
+       --disable-build-info \
        --disable-loadable-modules \
        --disable-gnuregex \
        --disable-optimizations \
@@ -51,7 +61,7 @@ OPTS=" \
        --disable-cachemgr-hostname \
        --disable-eui \
        --disable-htcp \
-       --disable-ssl \
+       --disable-ssl-crtd \
        --disable-forw-via-db \
        --disable-cache-digests \
        --disable-poll \
@@ -67,7 +77,6 @@ OPTS=" \
        --disable-leakfinder \
        --disable-follow-x-forwarded-for \
        --disable-ident-lookups \
-       --disable-internal-dns \
        --disable-default-hostsfile \
        --disable-auth \
        --disable-basic-auth-helpers \
@@ -95,8 +104,9 @@ OPTS=" \
        --without-valgrind-debug \
        --without-ipv6-split-stack \
        --without-dns-cname \
+       --without-openssl \
        --without-po2html \
        "
 
 # Fix the distclean testing.
-export DISTCHECK_CONFIGURE_FLAGS="${OPTS}"
+export DISTCHECK_CONFIGURE_FLAGS