------------------------------------------------------------ revno: 258 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Sat 2007-05-05 17:18:06 +1000 message: use the new lib/events autoconf code modified: Makefile.in makefile.in-20061117234101-o3qt14umlg9en8z0-1 autogen.sh autogen.sh-20061117234101-o3qt14umlg9en8z0-3 configure.ac configure.ac-20061117234101-o3qt14umlg9en8z0-10 === modified file 'Makefile.in' --- a/Makefile.in 2007-05-03 22:30:18 +0000 +++ b/Makefile.in 2007-05-05 07:18:06 +0000 @@ -23,9 +23,6 @@ [EMAIL PROTECTED]@ -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_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@
=== modified file 'autogen.sh' --- a/autogen.sh 2006-11-17 23:41:20 +0000 +++ b/autogen.sh 2007-05-05 07:18:06 +0000 @@ -7,6 +7,8 @@ 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 === modified file 'configure.ac' --- a/configure.ac 2007-05-02 19:21:14 +0000 +++ b/configure.ac 2007-05-05 07:18:06 +0000 @@ -27,6 +27,7 @@ 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)
