Simplify handling of dependencies on external libraries in test_headers.

Signed-off-by: Jelmer Vernooij <jelmer@jelmer.uk>
(cherry picked from commit 3123e2c66a29aaabad7408107bcf4a0e841a93ec)

diff --git a/testsuite/headers/wscript_build b/testsuite/headers/wscript_build
index f612ad92615dc5dcdaf4866a32719beb4cdeb75e..c41c384b71a2aee4acdad6a8852bd4a46562e84e 100644 (file)
--- a/testsuite/headers/wscript_build
+++ b/testsuite/headers/wscript_build
@@ -28,22 +28,13 @@ bld.SAMBA_GENERATOR('test_headers.h',
                     source=public_headers,
                     target='test_headers.h')
 
-cflags=''
-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 % '../third_party/popt'
-
 if bld.env.DEVELOPER_MODE:
     bld.SAMBA_BINARY('test_headers',
                      source='test_headers.c',
                      includes="#include/public",
                      pyembed=True,
-                     cflags=cflags,
                      local_include=True,
                      global_include=False,
                      use_global_deps=False,
-                     install=False)
+                     install=False,
+                     deps='talloc tdb ldb tevent popt')