diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-06-15 19:16:35 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-06-15 19:16:35 +0200 |
| commit | 7cb41fde3c586daff0c9f52b2b214a8afc3a82a3 (patch) | |
| tree | cad0a533edafbc31e753e118de3f61b9b48e2e3e | |
| parent | adbfc2c65c45c8e7fdc6b0148e24ea3cef13ca86 (diff) | |
| download | samba-7cb41fde3c586daff0c9f52b2b214a8afc3a82a3.tar.gz samba-7cb41fde3c586daff0c9f52b2b214a8afc3a82a3.tar.bz2 samba-7cb41fde3c586daff0c9f52b2b214a8afc3a82a3.zip | |
Fix standalone ldb build.
(This used to be commit 4ac91e301455721b76f7f456bc50c5c6e47c05d3)
| -rw-r--r-- | source4/lib/events/configure.ac | 1 | ||||
| -rw-r--r-- | source4/lib/events/libevents.m4 | 1 | ||||
| -rw-r--r-- | source4/lib/ldb/Makefile.in | 9 |
3 files changed, 7 insertions, 4 deletions
diff --git a/source4/lib/events/configure.ac b/source4/lib/events/configure.ac index 26efe82ba4..fbd23b10e5 100644 --- a/source4/lib/events/configure.ac +++ b/source4/lib/events/configure.ac @@ -7,7 +7,6 @@ AC_INIT(events, 1.0.0) AC_CONFIG_SRCDIR([events.c]) AC_CONFIG_HEADER(config.h) AC_LIBREPLACE_ALL_CHECKS -AC_LIBREPLACE_NETWORK_CHECKS m4_include(libtalloc.m4) diff --git a/source4/lib/events/libevents.m4 b/source4/lib/events/libevents.m4 index be3f1bb638..552dc7c43e 100644 --- a/source4/lib/events/libevents.m4 +++ b/source4/lib/events/libevents.m4 @@ -14,6 +14,7 @@ if test x"$eventsdir" = "x"; then fi EVENTS_OBJ="events.o events_select.o events_signal.o events_timed.o events_standard.o events_debug.o events_util.o" +AC_LIBREPLACE_NETWORK_CHECKS SMB_ENABLE(EVENTS_EPOLL, NO) SMB_ENABLE(EVENTS_AIO, NO) diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in index a53c5542da..ecb6b6516b 100644 --- a/source4/lib/ldb/Makefile.in +++ b/source4/lib/ldb/Makefile.in @@ -11,7 +11,7 @@ includedir = @includedir@ libdir = @libdir@ bindir = @bindir@ mandir = @mandir@ -VPATH = @srcdir@:@tdbdir@:@tallocdir@:@libreplacedir@:@poptdir@ +VPATH = @srcdir@:@tdbdir@:@tallocdir@:@libreplacedir@:@poptdir@:@eventsdir@ srcdir = @srcdir@ builddir = @builddir@ SLAPD = @SLAPD@ @@ -33,6 +33,9 @@ TDB_LIBS = @TDB_LIBS@ TDB_CFLAGS = @TDB_CFLAGS@ TDB_OBJ = @TDB_OBJ@ +EVENTS_CFLAGS = @EVENTS_CFLAGS@ +EVENTS_OBJ = @EVENTS_OBJ@ + POPT_LIBS = @POPT_LIBS@ POPT_CFLAGS = @POPT_CFLAGS@ POPT_OBJ = @POPT_OBJ@ @@ -52,13 +55,13 @@ LIBS = @LIBS@ PICFLAG = @PICFLAG@ CFLAGS=-g -I$(srcdir)/include -Iinclude -I$(srcdir) -I$(srcdir)/.. \ - $(POPT_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) \ + $(POPT_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) $(EVENTS_CFLAGS) \ -DLIBDIR=\"$(libdir)\" -DSHLIBEXT=\"$(SHLIBEXT)\" -DUSE_MMAP=1 @CFLAGS@ MDLD = @MDLD@ MDLD_FLAGS = @MDLD_FLAGS@ -OBJS = $(MODULES_OBJ) $(COMMON_OBJ) $(LDB_TDB_OBJ) $(TDB_OBJ) $(TALLOC_OBJ) $(POPT_OBJ) $(LDB_MAP_OBJ) @LIBREPLACEOBJ@ $(EXTRA_OBJ) +OBJS = $(MODULES_OBJ) $(COMMON_OBJ) $(LDB_TDB_OBJ) $(TDB_OBJ) $(EVENTS_OBJ) $(TALLOC_OBJ) $(POPT_OBJ) $(LDB_MAP_OBJ) @LIBREPLACEOBJ@ $(EXTRA_OBJ) headers = $(srcdir)/include/ldb.h $(srcdir)/include/ldb_errors.h $(srcdir)/include/ldb_handlers.h |