summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-02-17 14:15:31 +1100
committerAndrew Tridgell <tridge@samba.org>2011-02-18 15:09:47 +1100
commit88508291fe80829b559f8e6b91a7453e03479111 (patch)
tree1228db9c82a3dca733981a15c01093446f721b0b
parentfd000928e3ccbb5a3eb447f4644e290dc5dae016 (diff)
downloadsamba-88508291fe80829b559f8e6b91a7453e03479111.tar.gz
samba-88508291fe80829b559f8e6b91a7453e03479111.tar.bz2
samba-88508291fe80829b559f8e6b91a7453e03479111.zip
s3-waf: fixed the include paths for samba public libraries
this fixes the extra global includes for the s3 waf build to be conditional on whether talloc, tevent and tdb are system libraries or not. This fixes a problem where in-tree includes could be used with system libraries Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--source3/wscript12
1 files changed, 8 insertions, 4 deletions
diff --git a/source3/wscript b/source3/wscript
index dac52a7b67..fc4cb2dfca 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -74,10 +74,6 @@ def configure(conf):
if Options.options.with_swat:
conf.env['build_swat'] = True
- conf.ADD_EXTRA_INCLUDES('''#source3 #source3/include #lib/replace #lib/talloc
- #lib/tevent #lib/addns #source3/librpc
- #source3/lib #lib/tdb/include #lib/popt''')
-
conf.RECURSE('../lib/replace')
conf.RECURSE('build')
conf.RECURSE('../lib/tdb')
@@ -90,6 +86,14 @@ def configure(conf):
conf.RECURSE('../libcli/smbreadline')
conf.RECURSE('../lib/util')
+ conf.ADD_EXTRA_INCLUDES('''#source3 #source3/include''')
+ if not conf.env.USING_SYSTEM_TDB:
+ conf.ADD_EXTRA_INCLUDES('#lib/tdb/include')
+ if not conf.env.USING_SYSTEM_TEVENT:
+ conf.ADD_EXTRA_INCLUDES('#lib/tevent')
+ if not conf.env.USING_SYSTEM_TALLOC:
+ conf.ADD_EXTRA_INCLUDES('#lib/talloc')
+
conf.ADD_LDFLAGS("-Wl,--export-dynamic", testflags=True)
conf.CHECK_HEADERS('execinfo.h libexc.h libunwind.h netdb.h')