ctdb-build: Define CTDB_SOCKET at configure time

Currently only Samba is built with CTDB and since CTDB headers are not
public any more, no other application can build with CTDB.  So define
CTDB_SOCKET only during build.

In future CTDB will have public API and proper way of figuring out
CTDB_SOCKET.

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

ctdb/include/ctdb_protocol.h

@@ -22,13 +22,6 @@
 
 #include <sys/socket.h>
 
-/* location of daemon socket, set at configure time */
-#ifdef SOCKPATH
-#define CTDB_SOCKET 	SOCKPATH
-#else
-#define CTDB_SOCKET 	"/var/run/ctdb/ctdbd.socket"
-#endif
-
 /* default ctdb port number */
 #define CTDB_PORT 4379
 

ctdb/wscript

@@ -192,16 +192,15 @@ def configure(conf):
     else:
         conf.env.CTDB_SOCKPATH = os.path.join(conf.env.CTDB_RUNDIR,
                                               'ctdbd.socket')
+    conf.define('CTDB_SOCKET', conf.env.CTDB_SOCKPATH)
 
     conf.ADD_CFLAGS('''-DCTDB_HELPER_BINDIR=\"%s\"
                        -DLOGDIR=\"%s\"
-                       -DSOCKPATH=\"%s\"
                        -DCTDB_ETCDIR=\"%s\"
                        -DCTDB_VARDIR=\"%s\"
                        -DCTDB_RUNDIR=\"%s\"''' % (
                     conf.env.CTDB_BINDIR,
                     conf.env.CTDB_LOGDIR,
-                    conf.env.CTDB_SOCKPATH,
                     conf.env.CTDB_ETCDIR,
                     conf.env.CTDB_VARDIR,
                     conf.env.CTDB_RUNDIR))