Update submodule wiki

[buildfarm-client.git] / build-farm.conf.template

diff --git a/build-farm.conf.template b/build-farm.conf.template
index 4ac7684e6b3cde276ce0db9c308f20a48965daa0..a2745d252f6a13407cfe90d708d56457a6300e20 100644 (file)
--- a/build-farm.conf.template
+++ b/build-farm.conf.template
@@ -146,10 +146,11 @@ our %conf =(
         SUPPORT_MAILDIR => 'yes',
         # Other examples. Could use makefile_regex instead.
         #
+       WITH_CONTENT_SCAN => 'yes',
         #SUPPORT_TLS => 'yes',
         #  Enable the proper libs here or see in makefile_regex
         #  for use of pkg-config
-        #USE_GNUTLS => 'yes'
+        #USE_GNUTLS => 'yes',
         #TLS_LIBS => '-lssl -lcrypto',
         #
         #LOOKUP_LDAP => 'yes',
@@ -160,19 +161,19 @@ our %conf =(
         #LOOKUP_PGSQL => 'yes',
         #SUPPORT_PROXY => 'yes',
         #SUPPORT_SOCKS => 'yes',
-        #EXPERIMENTAL_SPF => 'yes',
-        #EXPERIMENTAL_DANE => 'yes',
+        #SUPPORT_SPF => 'yes',
+        #SUPPORT_DANE => 'yes',
     },
     # Settings to add to Local/Makefile. These will add to variables that
     # are already defined earlier in the Makefile.  Example:
     # LDFLAGS => '-Wall'  will create  LDFLAGS+='-Wall'
     makefile_add =>{
         # Show all warnings and errors
-        CFLAGS => '-Wall -Werror=format-security',
+        CFLAGS => '-Wall -Wno-parentheses -Werror=format-security',
         # Or enable debugging flags
         #CFLAGS => '-g -Wall',
         #LFLAGS => '-g',
-        # If set EXPERIMENTAL_SPF above, add it to the linker:
+        # If set SUPPORT_SPF above, add it to the linker:
         #LDFLAGS => '-lspf2',
     },
 
@@ -238,4 +239,10 @@ if ($branch eq 'global')
 #
 ##################################
 
+# Eg:
+#if ($branch eq 'exim-4.90+fixes')
+#{
+#      $conf{makefile_set}{SUPPORT_DANE} = '';
+#}
+
 1;