Changed build control

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

diff --git a/build-farm.conf.template b/build-farm.conf.template
index cb08834c5c9945bea2f9c4105d0efeebdb8b1552..5f5e4b8ef0424274f2221ee45f59106d62eac51c 100644 (file)
--- a/build-farm.conf.template
+++ b/build-farm.conf.template
@@ -141,15 +141,17 @@ our %conf =(
     makefile_set =>{
         # uncomment to use ccache
         #CC => 'ccache gcc',
     makefile_set =>{
         # uncomment to use ccache
         #CC => 'ccache gcc',

+       HAVE_IPV6 => 'yes',

         # Required for some tests to pass
         AUTH_PLAINTEXT => 'yes',
         SUPPORT_MAILDIR => 'yes',
         # Other examples. Could use makefile_regex instead.
         #
        WITH_CONTENT_SCAN => 'yes',
         # Required for some tests to pass
         AUTH_PLAINTEXT => 'yes',
         SUPPORT_MAILDIR => 'yes',
         # Other examples. Could use makefile_regex instead.
         #
        WITH_CONTENT_SCAN => 'yes',

-        #SUPPORT_TLS => 'yes',
+        #DISABLE_TLS => 'yes',

         #  Enable the proper libs here or see in makefile_regex
         #  for use of pkg-config
         #  Enable the proper libs here or see in makefile_regex
         #  for use of pkg-config

+        #USE_OPENSSL => 'yes',

         #USE_GNUTLS => 'yes',
         #TLS_LIBS => '-lssl -lcrypto',
         #
         #USE_GNUTLS => 'yes',
         #TLS_LIBS => '-lssl -lcrypto',
         #


@@ -169,7 +171,8 @@ our %conf =(
     # LDFLAGS => '-Wall'  will create  LDFLAGS+='-Wall'
     makefile_add =>{
         # Show all warnings and errors
     # LDFLAGS => '-Wall'  will create  LDFLAGS+='-Wall'
     makefile_add =>{
         # Show all warnings and errors

-        CFLAGS => '-Wall -Wno-parentheses -Werror=format-security',
+       # Some platforms need the c99 setting enabled
+        CFLAGS => '-std=c99 -Wall -Wno-parentheses -Werror=format-security',

         # Or enable debugging flags
         #CFLAGS => '-g -Wall',
         #LFLAGS => '-g',
         # Or enable debugging flags
         #CFLAGS => '-g -Wall',
         #LFLAGS => '-g',


@@ -251,11 +254,4 @@ if ($branch eq 'global')
 #      $conf{makefile_set}{SUPPORT_DANE} = '';
 #}
 
 #      $conf{makefile_set}{SUPPORT_DANE} = '';
 #}
 

-# Some platforms need the c99 setting enabled for 4.next, which starts using more c99 syntax
-if ($branch eq '4.next')
-{
-        $conf{makefile_add}{CFLAGS} .= ' -std=c99';
-}
-
-

 1;
 1;