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

(This used to be ctdb commit 8d65d7f399ba2e6a4162eed5e84a58c7cb024187)

diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in
index f2c690c8de061c401c75fbf2be0dd27b196d3ed3..bebdcead3a7905dc02c41c6f0938ab940c1a0a99 100755 (executable)
--- 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 2578fc0910c3d9b858dece9e1ecb353cbb227f46..13ca48ad9525b1611de720511b5acffa6357968c 100644 (file)
--- a/ctdb/configure.ac
+++ b/ctdb/configure.ac
@@ -63,6 +63,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, [], [],