ctdb-daemon: Move switch_from_server_to_client() to ctdb_daemon.c

[kai/samba-autobuild/.git] / ctdb / wscript

diff --git a/ctdb/wscript b/ctdb/wscript
index 3e97274de10eb4bd70e76ce901117be662e9e786..cea9e42a49ca84d1a2f9ebe0c4b3a3cce18593ed 100755 (executable)
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -212,16 +212,14 @@ def configure(conf):
     # Allow unified compilation and separate compilation of utilities
     # to find includes
     if not conf.env.standalone_ctdb:
-        conf.ADD_EXTRA_INCLUDES('#include/public #ctdb/include')
+        conf.ADD_EXTRA_INCLUDES('#include/public #ctdb/include #ctdb')
     else:
         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.ADD_EXTRA_INCLUDES('#lib #lib/replace')
 
@@ -229,6 +227,19 @@ def configure(conf):
         conf.DEFINE('SAMBA_UTIL_CORE_ONLY', 1, add_to_cflags=True)
         conf.SAMBA_CONFIG_H()
 
+    if 'XSLTPROC_MANPAGES' in conf.env and conf.env['XSLTPROC_MANPAGES']:
+        conf.env.ctdb_generate_manpages = True
+    else:
+        conf.env.ctdb_generate_manpages = False
+
+        Logs.info("xsltproc unavailable, checking for pre-built manpages")
+        conf.env.ctdb_prebuilt_manpages = []
+        for m in manpages:
+            if os.path.exists(os.path.join("doc", m)):
+                Logs.info("  %s: yes" % (m))
+                conf.env.ctdb_prebuilt_manpages.append(m)
+            else:
+                Logs.info("  %s: no" % (m))
 
 def build(bld):
     if bld.env.standalone_ctdb:
@@ -287,7 +298,7 @@ def build(bld):
     bld.SAMBA_SUBSYSTEM('ctdb-tcp',
                         source=bld.SUBDIR('tcp',
                                           'tcp_connect.c tcp_init.c tcp_io.c'),
-                        includes='include include/internal',
+                        includes='include',
                         deps='replace tdb talloc tevent')
 
     ib_deps = ''
@@ -296,7 +307,7 @@ def build(bld):
                             source=bld.SUBDIR('ib',
                                               '''ibwrapper.c ibw_ctdb.c
                                                  ibw_ctdb_init.c'''),
-                            includes='include include/internal',
+                            includes='include',
                             deps='replace talloc tevent')
         ib_deps = ' ctdb-ib rdmacm ibverbs'
 
@@ -315,7 +326,7 @@ def build(bld):
 
     bld.SAMBA_SUBSYSTEM('ctdb-system',
                         source='common/system_common.c ' + CTDB_SYSTEM_SRC,
-                        includes='include include/internal',
+                        includes='include',
                         deps='replace talloc tevent tdb pcap')
 
     bld.SAMBA_SUBSYSTEM('ctdb-common',
@@ -323,13 +334,13 @@ def build(bld):
                                           '''ctdb_io.c ctdb_util.c ctdb_ltdb.c
                                              cmdline.c rb_tree.c
                                              ctdb_fork.c'''),
-                        includes='include include/internal common .',
+                        includes='include',
                         deps='replace popt talloc tevent tdb popt ctdb-system')
 
     bld.SAMBA_SUBSYSTEM('ctdb-common-util',
                         source=bld.SUBDIR('common',
                                           'system_util.c ctdb_logging.c'),
-                        includes='include include/internal',
+                        includes='include',
                         deps='replace tevent tdb')
 
     bld.SAMBA_SUBSYSTEM('ctdb-util',
@@ -352,7 +363,7 @@ def build(bld):
 
     bld.SAMBA_SUBSYSTEM('ctdb-client',
                         source=bld.SUBDIR('client', 'ctdb_client.c'),
-                        includes='include include/internal',
+                        includes='include',
                         deps='''replace popt talloc tevent tdb
                                 samba-util tdb-wrap ctdb-util''')
 
@@ -364,7 +375,7 @@ def build(bld):
                                              client_control_sync.c
                                              client_db.c client_util.c
                                           '''),
-                        includes='include include/internal',
+                        includes='include',
                         deps='replace talloc tevent tdb tdb-wrap')
 
     bld.SAMBA_SUBSYSTEM('ctdb-server',
@@ -386,7 +397,7 @@ def build(bld):
                                              ctdb_statistics.c
                                              ctdb_update_record.c
                                              ctdb_lock.c'''),
-                        includes='include include/internal',
+                        includes='include',
                         deps='replace popt talloc tevent tdb talloc_report')
 
     bld.SAMBA_BINARY('ctdbd',
@@ -401,7 +412,7 @@ def build(bld):
                      source='tools/ctdb.c',
                      deps='''ctdb-client ctdb-common ctdb-common-util
                              ctdb-util''',
-                     includes='include include/internal',
+                     includes='include',
                      install_path='${BINDIR}',
                      manpages='ctdb.1')
 
@@ -415,12 +426,12 @@ def build(bld):
     bld.SAMBA_BINARY('ctdb_lock_helper',
                      source='server/ctdb_lock_helper.c',
                      deps='samba-util ctdb-common-util talloc tdb',
-                     includes='include include/internal',
+                     includes='include',
                      install_path='${BINDIR}')
 
     bld.SAMBA_BINARY('ctdb_event_helper',
                      source='server/ctdb_event_helper.c',
-                     includes='include include/internal',
+                     includes='include',
                      deps='samba-util ctdb-common-util replace tdb',
                      install_path='${BINDIR}')
 
@@ -463,7 +474,7 @@ def build(bld):
     if bld.env.HAVE_PMDA:
         bld.SAMBA_BINARY('pmdactdb',
                          source='utils/pmda/pmda_ctdb.c',
-                         includes='include include/internal',
+                         includes='include',
                          deps='''ctdb-client ctdb-common
                                  ctdb-common-util pcp_pmda pcp''',
                          install_path='${CTDB_PMDADIR}')
@@ -495,12 +506,12 @@ def build(bld):
                             target=x,
                             rule='sed %s ${SRC} > ${TGT}' % (sed_cmdline))
 
-    if 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
+    if bld.env.ctdb_generate_manpages:
         bld.MANPAGES('''onnode.1 ctdbd_wrapper.1 ctdbd.conf.5
                         ctdb.7 ctdb-statistics.7 ctdb-tunables.7''',
                       True)
     else:
-        for m in manpages:
+        for m in bld.env.ctdb_prebuilt_manpages:
             bld.SAMBA_GENERATOR(m,
                                 source=os.path.join("doc", m),
                                 target=m,
@@ -653,7 +664,7 @@ def build(bld):
 
         bld.SAMBA_BINARY(target,
                          source=src,
-                         includes='include include/internal',
+                         includes='include',
                          deps='''ctdb-client ctdb-common ctdb-common-util
                                  ctdb-util''',
                          install_path='${CTDB_TEST_LIBDIR}')
@@ -663,27 +674,27 @@ def build(bld):
                      deps='''replace popt tdb tevent talloc ctdb-system
                              samba-util tdb-wrap talloc_report''' +
                           ib_deps,
-                     includes='include include/internal',
+                     includes='include',
                      install_path='${CTDB_TEST_LIBDIR}')
 
     bld.SAMBA_BINARY('ctdb_functest',
                      source='tests/src/ctdb_functest.c',
                      deps='''replace tdb tevent talloc popt ctdb-system
                              samba-util tdb-wrap''',
-                     includes='include include/internal',
+                     includes='include',
                      install_path='${CTDB_TEST_LIBDIR}')
 
     bld.SAMBA_BINARY('ctdb_stubtest',
                      source='tests/src/ctdb_test.c',
                      deps='''replace tdb tevent talloc popt ctdb-system
                              samba-util tdb-wrap''',
-                     includes='include include/internal',
+                     includes='include',
                      install_path='${CTDB_TEST_LIBDIR}')
 
     if bld.env.HAVE_INFINIBAND:
         bld.SAMBA_BINARY('ibwrapper_test',
                          source='ib/ibwrapper_test.c',
-                         includes='include include/internal',
+                         includes='include',
                          deps='''replace talloc ctdb-client ctdb-common
                                  ctdb-common-util''' +
                               ib_deps,