From 1958a0987e5aa252eac6bffd1b829eb1405b9591 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 7 Mar 2010 22:52:13 +1100
Subject: build: added CHECK_CFLAGS()

---
 buildtools/wafsamba/samba_autoconf.py | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

(limited to 'buildtools')

diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index 84f6a2d10f..b186804292 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -49,11 +49,14 @@ def CHECK_TYPES(conf, list):
 
 
 @conf
-def CHECK_TYPE_IN(conf, t, hdr):
+def CHECK_TYPE_IN(conf, t, hdr, define=None):
     '''check for a type in a specific header'''
     if conf.check(header_name=hdr):
-        conf.check(type_name=t, header_name=hdr)
-        return True
+        if define is None:
+            ret = conf.check(type_name=t, header_name=hdr)
+        else:
+            ret = conf.check(type_name=t, header_name=hdr, define_name=define)
+        return ret
     return False
 
 
@@ -169,8 +172,8 @@ def CHECK_SIZEOF(conf, vars, headers=None, define=None):
 
 @conf
 def CHECK_CODE(conf, code, define,
-               always=False, execute=False, addmain=True,
-               headers=None, msg=None):
+               always=False, execute=False, addmain=True, mandatory=False,
+               headers=None, msg=None, cflags=''):
     '''check if some code compiles and/or runs'''
     hdrs=''
     if headers is not None:
@@ -197,14 +200,17 @@ def CHECK_CODE(conf, code, define,
 
     if conf.check(fragment=fragment,
                   execute=execute,
-                  ccflags='-I%s' % conf.curdir,
+                  define_name = define,
+                  mandatory = mandatory,
+                  ccflags='-I%s %s' % (conf.curdir, cflags),
                   includes='# . ../default',
                   msg=msg):
         conf.DEFINE(define, 1)
         return True
-    elif always:
+    if always:
         conf.DEFINE(define, 0)
-        return False
+    return False
+
 
 
 @conf
@@ -238,6 +244,18 @@ def CHECK_STRUCTURE_MEMBER(conf, structname, member,
         return False
 
 
+@conf
+def CHECK_CFLAGS(conf, cflags, variable):
+    '''check if the given cflags are accepted by the compiler'''
+    if conf.check(fragment='int main(void) { return 0; }',
+                  execute=0,
+                  ccflags=cflags,
+                  msg="Checking compiler accepts %s" % cflags):
+        conf.env[variable] = cflags
+        return True
+    return False
+
+
 #################################################
 # return True if a configuration option was found
 @conf
-- 
cgit