[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  9487785 s3-build: Support building with in-tree CTDB
       via  6edbbce ctdb-build: Move internal include files in a separate directory
       via  f4b06b0 ctdb-build: Build ctdb_version.h before compiling files that include it
      from  f52690d libcli: Fix a memleak

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 9487785e89e9c6f920c6284a1bd1165bd7d80cc0
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Wed May 14 01:11:43 2014 +1000

    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 at gmail.com>
    Reviewed-by: Michael Adam <obnox at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Tue May 27 16:07:13 CEST 2014 on sn-devel-104

commit 6edbbce887d4af28b026a43059cd339fb3674932
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Tue May 13 23:13:13 2014 +1000

    ctdb-build: Move internal include files in a separate directory
    
    This will allow to build clustered samba with built-in ctdb tree rather
    than needing to install CTDB first.
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit f4b06b0ec4ee1af5368e2fc171d7f7809bf0697a
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Wed May 14 01:40:22 2014 +1000

    ctdb-build: Build ctdb_version.h before compiling files that include it
    
    This will correctly build ctdb_version.h before other targets when
    running make -j.
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Michael Adam <obnox at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 ctdb/Makefile.in                       |    6 +++++-
 ctdb/include/{ => internal}/cmdline.h  |    0
 ctdb/include/{ => internal}/idtree.h   |    0
 ctdb/include/{ => internal}/includes.h |    0
 source3/wscript                        |    7 +++++--
 source3/wscript_build                  |    3 ++-
 6 files changed, 12 insertions(+), 4 deletions(-)
 rename ctdb/include/{ => internal}/cmdline.h (100%)
 rename ctdb/include/{ => internal}/idtree.h (100%)
 rename ctdb/include/{ => internal}/includes.h (100%)


Changeset truncated at 500 lines:

diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in
index 3c9167d..f3cd70c 100755
--- a/ctdb/Makefile.in
+++ b/ctdb/Makefile.in
@@ -62,7 +62,8 @@ ifeq ($(CC),gcc)
 EXTRA_CFLAGS=-Wno-format-zero-length -Wno-deprecated-declarations -fPIC
 endif
 
-CFLAGS=@CPPFLAGS@ -g -I$(srcdir)/include -Iinclude -Ilib -Ilib/util -I$(srcdir) \
+CFLAGS=@CPPFLAGS@ -g -I$(srcdir)/include -I$(srcdir)/include/internal \
+       -Iinclude -Ilib -Ilib/util -I$(srcdir) \
        $(TALLOC_CFLAGS) $(TEVENT_CFLAGS) $(TDB_CFLAGS) -I at libreplacedir@ \
 	-DVARDIR=\"$(localstatedir)\" -DETCDIR=\"$(etcdir)\" \
 	-DCTDB_VARDIR=\"$(localstatedir)/lib/ctdb\" \
@@ -158,6 +159,9 @@ $(CTDB_VERSION_H):
 	@echo Generating $@
 	$(WRAPPER) ./packaging/mkversion.sh
 
+server/ctdb_daemon.c: $(CTDB_VERSION_H)
+tools/ctdb.c: $(CTDB_VERSION_H)
+
 bin/ctdbd: $(CTDB_SERVER_OBJ)
 	@echo Linking $@
 	$(WRAPPER) $(CC) $(CFLAGS) -o $@ $(CTDB_SERVER_OBJ) $(LIB_FLAGS)
diff --git a/ctdb/include/cmdline.h b/ctdb/include/internal/cmdline.h
similarity index 100%
rename from ctdb/include/cmdline.h
rename to ctdb/include/internal/cmdline.h
diff --git a/ctdb/include/idtree.h b/ctdb/include/internal/idtree.h
similarity index 100%
rename from ctdb/include/idtree.h
rename to ctdb/include/internal/idtree.h
diff --git a/ctdb/include/includes.h b/ctdb/include/internal/includes.h
similarity index 100%
rename from ctdb/include/includes.h
rename to ctdb/include/internal/includes.h
diff --git a/source3/wscript b/source3/wscript
index 7cc62cc..3b38d19 100644
--- 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 f13aa63..d319e5e 100755
--- 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)
 


-- 
Samba Shared Repository