From 3254003956d069df3860cba3f58d11f1055e06b0 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 19 Mar 2010 19:50:21 +1100
Subject: build: fixed includes paths for CHECK_CODE()

---
 buildtools/wafsamba/samba_autoconf.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'buildtools')

diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index cb8ee180bd..4d6ac26a6c 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -173,7 +173,7 @@ def CHECK_SIZEOF(conf, vars, headers=None, define=None):
 @conf
 def CHECK_CODE(conf, code, define,
                always=False, execute=False, addmain=True, mandatory=False,
-               headers=None, msg=None, cflags='', includes='# . ../default',
+               headers=None, msg=None, cflags='', includes='# .',
                local_include=True):
     '''check if some code compiles and/or runs'''
     hdrs=''
@@ -199,8 +199,11 @@ def CHECK_CODE(conf, code, define,
     if msg is None:
         msg="Checking for %s" % define
 
+    # include the directory containing __confdefs.h
+    cflags += ' -I../../default'
+
     if local_include:
-        cflags = cflags + ' -I%s' % conf.curdir
+        cflags += ' -I%s' % conf.curdir
 
     if conf.check(fragment=fragment,
                   execute=execute,
-- 
cgit