[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha4-84-g1659a57

Jelmer Vernooij jelmer at samba.org
Sun Jun 15 17:21:22 GMT 2008


The branch, v4-0-test has been updated
       via  1659a572c49b2f9cf336b27ec1c1bec1b86d688e (commit)
       via  4ac91e301455721b76f7f456bc50c5c6e47c05d3 (commit)
       via  dd1f24d0c6dfb19ba08282b91998f6881782c4fb (commit)
      from  b32a040c2f0eb28d68837bde727437ca118d1b18 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 1659a572c49b2f9cf336b27ec1c1bec1b86d688e
Merge: 4ac91e301455721b76f7f456bc50c5c6e47c05d3 b32a040c2f0eb28d68837bde727437ca118d1b18
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Jun 15 19:18:48 2008 +0200

    Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-fixmodulesdir

commit 4ac91e301455721b76f7f456bc50c5c6e47c05d3
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Jun 15 19:16:35 2008 +0200

    Fix standalone ldb build.

commit dd1f24d0c6dfb19ba08282b91998f6881782c4fb
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Jun 15 19:16:06 2008 +0200

    Fix ldb python bindings after events changes.

-----------------------------------------------------------------------

Summary of changes:
 source/lib/events/configure.ac |    1 -
 source/lib/events/libevents.m4 |    1 +
 source/lib/ldb/Makefile.in     |    9 ++++++---
 source/lib/ldb/ldb.i           |    4 +++-
 source/lib/ldb/ldb_wrap.c      |    5 +++--
 5 files changed, 13 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/events/configure.ac b/source/lib/events/configure.ac
index 26efe82..fbd23b1 100644
--- a/source/lib/events/configure.ac
+++ b/source/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/source/lib/events/libevents.m4 b/source/lib/events/libevents.m4
index be3f1bb..552dc7c 100644
--- a/source/lib/events/libevents.m4
+++ b/source/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/source/lib/ldb/Makefile.in b/source/lib/ldb/Makefile.in
index a53c554..ecb6b65 100644
--- a/source/lib/ldb/Makefile.in
+++ b/source/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
 
diff --git a/source/lib/ldb/ldb.i b/source/lib/ldb/ldb.i
index 061d13a..23b5e0d 100644
--- a/source/lib/ldb/ldb.i
+++ b/source/lib/ldb/ldb.i
@@ -685,7 +685,9 @@ PyObject *PyExc_LdbError;
 /* Top-level ldb operations */
 typedef struct ldb_context {
     %extend {
-        ldb(void) { return ldb_init(NULL); }
+        ldb(void) { 
+            return ldb_init(NULL, event_context_init(NULL)); 
+        }
 
         %feature("docstring") connect "S.connect(url,flags=0,options=None) -> None\n" \
                                       "Connect to a LDB URL.";
diff --git a/source/lib/ldb/ldb_wrap.c b/source/lib/ldb/ldb_wrap.c
index ee374b8..aed3f13 100644
--- a/source/lib/ldb/ldb_wrap.c
+++ b/source/lib/ldb/ldb_wrap.c
@@ -2546,7 +2546,6 @@ static swig_module_info swig_module = {swig_types, 24, 0, 0, 0, 0};
 #include <stdint.h>
 #include <stdbool.h>
 #include "talloc.h"
-#include "events.h"
 #include "ldb.h"
 #include "ldb_errors.h"
 #include "ldb_private.h"
@@ -3067,7 +3066,9 @@ static void py_ldb_debug(void *context, enum ldb_debug_level level, const char *
 
 PyObject *PyExc_LdbError;
 
-SWIGINTERN ldb *new_ldb(){ return ldb_init(NULL, NULL); }
+SWIGINTERN ldb *new_ldb(){ 
+            return ldb_init(NULL, event_context_init(NULL)); 
+        }
 
 SWIGINTERN int
 SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val) 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list