From: Michael Adam <obnox@samba.org>
Date: Thu, 20 Oct 2011 12:22:30 +0000 (+0200)
Subject: ctdb: add --enable-socket-wrapper to build binaries with socket wrapper support
X-Git-Url: http://git.samba.org/?p=obnox%2Fsamba%2Fsamba-obnox.git;a=commitdiff_plain;h=f3f150cf0cfecdc466909e77eb3fa59df360a5ca

ctdb: add --enable-socket-wrapper to build binaries with socket wrapper support
---

diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in
index 7ec430c1649..4449926f89b 100755
--- a/ctdb/Makefile.in
+++ b/ctdb/Makefile.in
@@ -29,6 +29,8 @@ POPT_LIBS = @POPT_LIBS@
 POPT_CFLAGS = @POPT_CFLAGS@
 POPT_OBJ = @POPT_OBJ@
 
+SOCKET_WRAPPER_OBJ = @SOCKET_WRAPPER_OBJS@
+
 PMDA_LIBS = -lpcp -lpcp_pmda
 PMDA_INSTALL = @CTDB_PMDA_INSTALL@
 PMDA_DEST_DIR = /var/lib/pcp/pmdas
@@ -52,13 +54,13 @@ CTDB_COMMON_OBJ =  common/ctdb_io.o common/ctdb_util.o \
 
 CTDB_LIB_OBJ = libctdb/ctdb.o libctdb/io_elem.o libctdb/local_tdb.o \
 	libctdb/messages.o libctdb/sync.o libctdb/control.o \
-	libctdb/logging.o
+	libctdb/logging.o $(SOCKET_WRAPPER_OBJ)
 
 CTDB_TCP_OBJ = tcp/tcp_connect.o tcp/tcp_io.o tcp/tcp_init.o
 
 CTDB_CLIENT_OBJ = client/ctdb_client.o \
 	$(CTDB_COMMON_OBJ) $(POPT_OBJ) $(UTIL_OBJ) @TALLOC_OBJ@ @TDB_OBJ@ \
-	@LIBREPLACEOBJ@ $(EXTRA_OBJ) @TEVENT_OBJ@
+	@LIBREPLACEOBJ@ $(EXTRA_OBJ) @TEVENT_OBJ@ $(SOCKET_WRAPPER_OBJ)
 
 CTDB_SERVER_OBJ = server/ctdbd.o server/ctdb_daemon.o server/ctdb_lockwait.o \
 	server/ctdb_recoverd.o server/ctdb_recover.o server/ctdb_freeze.o \
diff --git a/ctdb/configure.ac b/ctdb/configure.ac
index adcc5dadad9..842887b5742 100644
--- a/ctdb/configure.ac
+++ b/ctdb/configure.ac
@@ -62,6 +62,7 @@ m4_include(libtevent.m4)
 m4_include(ib/config.m4)
 m4_include(lib/util/signal.m4)
 m4_include(lib/util/fault.m4)
+m4_include(lib/socket_wrapper/config.m4)
 
 AC_CHECK_HEADERS(sched.h)
 AC_CHECK_HEADERS(pcp/pmapi.h pcp/impl.h pcp/pmda.h, [], [],