From 01598ce18d7980a3aa13314e943a5d82bdcbd672 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Thu, 4 Sep 2014 11:37:15 +1000 Subject: [PATCH] ctdb-build: Add extra includes to help recursive utility compilation Subsequent commits will introduce recursive compilation of utilities. Unfortunately the include file structure requires some global includes to be found, so make this work. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/wscript | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ctdb/wscript b/ctdb/wscript index 4854198d060..81039e61510 100755 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -153,6 +153,17 @@ def configure(conf): 'share/ctdb-tests') conf.env.CTDB_TEST_LIBDIR = os.path.join(conf.env.LIBDIR, 'ctdb-tests') + # Allow separate compilation of utilities to find includes + if srcdir == '.': + # Building from tarball + conf.ADD_EXTRA_INCLUDES('#include') + conf.ADD_EXTRA_INCLUDES('#include/internal') + else: + # Building standalone CTDB from within Samba tree + conf.ADD_EXTRA_INCLUDES('#ctdb/include') + conf.ADD_EXTRA_INCLUDES('#ctdb/include/internal') + conf.ADD_EXTRA_INCLUDES('#ctdb') + conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True) conf.SAMBA_CONFIG_H() -- 2.11.4.GIT