build: Remove configure option --with-ctdb-dir
authorAmitay Isaacs <amitay@gmail.com>
Fri, 10 Oct 2014 00:42:05 +0000 (11:42 +1100)
committerAmitay Isaacs <amitay@samba.org>
Tue, 28 Oct 2014 04:42:04 +0000 (05:42 +0100)
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Michael Adam <obnox@samba.org>
source3/wscript

index 0c3c9949fb783e2563dc13f939f20a8ad1e171e4..bac488cf1ae34124bb9f6b13cb2034a62bca250b 100644 (file)
@@ -52,10 +52,6 @@ def set_options(opt):
     opt.SAMBA3_ADD_OPTION('fake-kaserver',
                           help=("Include AFS fake-kaserver support"), default=False)
 
-    opt.add_option('--with-ctdb-dir',
-                   help=("Directory under which ctdb is installed"),
-                   action="store", dest='ctdb_dir', default=None)
-
     opt.add_option('--with-libcephfs',
                    help=("Directory under which libcephfs is installed"),
                    action="store", dest='libcephfs_dir', default=None)
@@ -1483,10 +1479,7 @@ main() {
         else:
             includes = ''
 
-        if Options.options.ctdb_dir:
-            CTDB_INCLUDE = Options.options.ctdb_dir + '/include'
-        else:
-            CTDB_INCLUDE = conf.srcdir + '/ctdb/include'
+        CTDB_INCLUDE = conf.srcdir + '/ctdb/include'
         includes = includes + ' ' + CTDB_INCLUDE
 
         if not conf.env.USING_SYSTEM_TDB: