use the new lib/events autoconf code

diff --git a/Makefile.in b/Makefile.in
index 20410a8944c003efffa83600e566b77521290ac9..6604ef1b1503a688aa5d4a557101a34b71d128f4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -23,9 +23,6 @@ CFLAGS=-g -I$(srcdir)/include -Iinclude -Ilib -Ilib/util -I$(srcdir) \
 
 LIB_FLAGS=@LDFLAGS@ -Llib @LIBS@ $(POPT_LIBS) @INFINIBAND_LIBS@
 
-EVENTS_OBJ = lib/events/events.o lib/events/events_standard.o \
-       lib/events/events_signal.o lib/events/events_timed.o
-
 UTIL_OBJ = lib/util/idtree.o lib/util/db_wrap.o lib/util/strlist.o lib/util/util.o
 
 CTDB_COMMON_OBJ = common/ctdb.o common/ctdb_daemon.o common/ctdb_client.o \
@@ -38,7 +35,7 @@ CTDB_TCP_OBJ = tcp/tcp_connect.o tcp/tcp_io.o tcp/tcp_init.o
 
 CTDB_OBJ = $(CTDB_COMMON_OBJ) $(CTDB_TCP_OBJ) $(POPT_OBJ)
 
-OBJS = @TDB_OBJ@ @TALLOC_OBJ@ @LIBREPLACEOBJ@ @INFINIBAND_WRAPPER_OBJ@ $(EXTRA_OBJ) $(EVENTS_OBJ) $(CTDB_OBJ) $(UTIL_OBJ)
+OBJS = @TDB_OBJ@ @TALLOC_OBJ@ @LIBREPLACEOBJ@ @INFINIBAND_WRAPPER_OBJ@ $(EXTRA_OBJ) @EVENTS_OBJ@ $(CTDB_OBJ) $(UTIL_OBJ)
 
 BINS = bin/ctdbd bin/ctdbd_test bin/ctdb_test bin/ctdb_bench bin/ctdb_messaging bin/ctdb_fetch bin/ctdb_fetch1 bin/lockwait bin/ctdb_control bin/ctdb_dump bin/recoverd @INFINIBAND_BINS@
 

diff --git a/autogen.sh b/autogen.sh
index 500cab87d500190179bf602defa15ef3e9529d1d..a361cd16e8de9557cc3a89c5bfd1d75a502be5c1 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,6 +7,8 @@ IPATHS="-I libreplace -I lib/replace -I ../libreplace -I ../replace"
 IPATHS="$IPATHS -I lib/talloc -I talloc -I ../talloc"
 IPATHS="$IPATHS -I lib/tdb -I tdb -I ../tdb"
 IPATHS="$IPATHS -I lib/popt -I popt -I ../popt"
+IPATHS="$IPATHS -I lib/events"
+
 autoheader $IPATHS || exit 1
 autoconf $IPATHS || exit 1
 

diff --git a/configure.ac b/configure.ac
index b65cec58b2b258adf52030e95ba576c907045f63..dd379b98cc67d4030df8548d181df8304e32b358 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,6 +27,7 @@ EXTRA_OBJ=""
 m4_include(libpopt.m4)
 m4_include(libtalloc.m4)
 m4_include(libtdb.m4)
+m4_include(libevents.m4)
 m4_include(ib/config.m4)
 
 AC_SUBST(EXTRA_OBJ)