From 46384cf60a41ee23927f2f4c26fe9239bdbf154a Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 16 Mar 2011 17:42:24 +1100 Subject: headers: cope with non-system popt in test_headers Autobuild-User: Andrew Tridgell Autobuild-Date: Wed Mar 16 09:09:40 CET 2011 on sn-devel-104 --- testsuite/headers/wscript_build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'testsuite') 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', -- cgit