summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-03-16 17:42:24 +1100
committerAndrew Tridgell <tridge@samba.org>2011-03-16 09:09:40 +0100
commit46384cf60a41ee23927f2f4c26fe9239bdbf154a (patch)
tree9a3e6ad9e01e7abef436995fc8b909179a05f02a
parent3cfa8216b97197694a90833b30aade12586d8a96 (diff)
downloadsamba-46384cf60a41ee23927f2f4c26fe9239bdbf154a.tar.gz
samba-46384cf60a41ee23927f2f4c26fe9239bdbf154a.tar.bz2
samba-46384cf60a41ee23927f2f4c26fe9239bdbf154a.zip
headers: cope with non-system popt in test_headers
Autobuild-User: Andrew Tridgell <tridge@samba.org> Autobuild-Date: Wed Mar 16 09:09:40 CET 2011 on sn-devel-104
-rw-r--r--testsuite/headers/wscript_build5
1 files changed, 4 insertions, 1 deletions
diff --git a/testsuite/headers/wscript_build b/testsuite/headers/wscript_build
index b2b88fe4d8..f83538ef09 100644
--- a/testsuite/headers/wscript_build
+++ b/testsuite/headers/wscript_build
@@ -24,11 +24,14 @@ bld.SAMBA_GENERATOR('test_headers.h',
target='test_headers.h')
cflags=''
-for lib in ['talloc', 'tevent', 'tdb', 'ldb' ]:
+for lib in ['talloc', 'tevent', 'tdb', 'ldb', 'popt' ]:
ename = 'CPPPATH_%s' % lib.upper()
for p in bld.env[ename]:
cflags += bld.env.CPPPATH_ST % p + ' '
+if not bld.env.USING_SYSTEM_POPT:
+ cflags += bld.env.CPPPATH_ST % '../lib/popt'
+
if bld.env.DEVELOPER_MODE:
bld.SAMBA_BINARY('test_headers',
source='test_headers.c',