sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s3-waf: fixed the include paths for samba public libraries

Browse Source 
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>
This commit is contained in:
Andrew Tridgell 2011-02-17 14:15:31 +11:00
parent fd000928e3
commit 88508291fe
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source3/wscript
View File

@ -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')