s3-build: Support building with in-tree CTDB

If --with-ctdb-dir option is not specified, use CTDB headers from ctdb/
subdirectory in the source tree.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Michael Adam <obnox@samba.org>
Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Tue May 27 16:07:13 CEST 2014 on sn-devel-104

diff --git a/source3/wscript b/source3/wscript
index 7cc62cc3e5801e4abe3b1df6d3b4d2a540622bc6..3b38d19ae9d4354e15dd93130bf92812ac6b7ee0 100644 (file)
--- a/source3/wscript
+++ b/source3/wscript
@@ -1451,8 +1451,10 @@ main() {
             includes = ''
 
         if Options.options.ctdb_dir:
-            CTDB_CFLAGS = '-I' + Options.options.ctdb_dir + '/include'
-            includes = includes + ' ' + Options.options.ctdb_dir + '/include'
+            CTDB_INCLUDE = Options.options.ctdb_dir + '/include'
+        else:
+            CTDB_INCLUDE = conf.srcdir + '/ctdb/include'
+        includes = includes + ' ' + CTDB_INCLUDE
 
         if not conf.env.USING_SYSTEM_TDB:
             includes = includes + ' ' + srcdir + '/lib/tdb/include'
@@ -1716,6 +1718,7 @@ main() {
     if have_cluster_support:
         Logs.info("building with cluster support")
         conf.env['CTDB_CFLAGS'] = CTDB_CFLAGS
+        conf.env['CTDB_INCLUDE'] = CTDB_INCLUDE
     else:
         if Options.options.with_cluster_support == False:
             Logs.info("building without cluster support (--without-cluster-support)")

diff --git a/source3/wscript_build b/source3/wscript_build
index f13aa630e8fe60eb97954d033753603621e58181..d319e5e7ac3c678e15c506d7f20ce0f05c1ae459 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -273,7 +273,7 @@ bld.SAMBA3_SUBSYSTEM('samba3util',
                    lib/sock_exec.c''',
                    deps='ndr samba-security NDR_SECURITY samba-util util_tdb ccan-hash')
 
-if bld.CONFIG_GET("CTDB_CFLAGS"):
+if bld.CONFIG_GET("CTDB_CFLAGS") and bld.CONFIG_GET("CTDB_INCLUDE"):
     SAMBA_CLUSTER_SUPPORT_SOURCES='''
                      lib/cluster_support.c
                      lib/dbwrap/dbwrap_ctdb.c
@@ -302,6 +302,7 @@ bld.SAMBA3_LIBRARY('samba-cluster-support',
                    source=SAMBA_CLUSTER_SUPPORT_SOURCES,
                    deps=SAMBA_CLUSTER_SUPPORT_DEPS,
                    cflags=bld.CONFIG_GET("CTDB_CFLAGS"),
+                   includes=bld.CONFIG_GET("CTDB_INCLUDE"),
                    allow_undefined_symbols=True,
                    private_library=True)