ctdb-build: Placeholder for public headers from lib/util

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>

diff --git a/ctdb/include/public/util/README.txt b/ctdb/include/public/util/README.txt
new file mode 100644 (file)
index 0000000..534e9b7
--- /dev/null
+++ b/ctdb/include/public/util/README.txt
@@ -0,0 +1,6 @@
+DO NOT REMOVE
+
+This is a placeholder to allow for build rules putting public headers
+in this directory. Using this directory allows us to ensure that our
+public headers will work with external applications that make use of
+Samba libraries

diff --git a/ctdb/wscript b/ctdb/wscript
index d075ad0dafe379c7f50851fee49bb6ea3309ba52..12779bc3fce5c747cafb0e92ec97fd364079e07b 100755 (executable)
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -213,7 +213,7 @@ def configure(conf):
     # Allow unified compilation and separate compilation of utilities
     # to find includes
     if not conf.env.standalone_ctdb:
-        conf.ADD_EXTRA_INCLUDES('#ctdb/include')
+        conf.ADD_EXTRA_INCLUDES('#include/public #ctdb/include')
     else:
         if srcdir == '.':
             # Building from tarball