From 0ad39b733af3f56480b5407ae7f346925b5d9e59 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 20 Oct 2011 14:17:45 +0200 Subject: [PATCH] build: add option --enable-socket-wrapper to build binaries with socket wrapper support (This used to be ctdb commit 8d65d7f399ba2e6a4162eed5e84a58c7cb024187) --- ctdb/Makefile.in | 6 ++++-- ctdb/configure.ac | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in index f2c690c8de0..bebdcead3a7 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 2578fc0910c..13ca48ad952 100644 --- 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, [], [],