Add some build fixes on top of the talloc, tdb, tevent, ldb rebases

7 files changed, 19 insertions, 15 deletions

diff --git a/ldb/Makefile.in b/ldb/Makefile.in
index d97ca8bde..3215acb5c 100644
--- a/ldb/Makefile.in
+++ b/ldb/Makefile.in
@@ -50,11 +50,11 @@ LD_EXPORT_DYNAMIC = @LD_EXPORT_DYNAMIC@
 SHLD = @SHLD@
 SHLD_FLAGS = @SHLD_FLAGS@
 
-LDFLAGS = @LDFLAGS@
+LDFLAGS += @LDFLAGS@
 LIBS = @LIBS@
 
 PICFLAG = @PICFLAG@
-CFLAGS=-g -I$(srcdir)/include -Iinclude -I$(srcdir) -I$(srcdir)/.. \
+CFLAGS += -I$(srcdir)/include -Iinclude -I$(srcdir) -I$(srcdir)/.. \
        $(POPT_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) $(EVENTS_CFLAGS) \
 	-DLIBDIR=\"$(libdir)\" -DSHLIBEXT=\"$(SHLIBEXT)\" -DUSE_MMAP=1 @CFLAGS@
 
diff --git a/ldb/external/libevents.m4 b/ldb/external/libevents.m4
index 4fd2e71ec..2aabb06d5 100644
--- a/ldb/external/libevents.m4
+++ b/ldb/external/libevents.m4
@@ -2,6 +2,6 @@ AC_SUBST(EVENTS_OBJ)
 AC_SUBST(EVENTS_CFLAGS)
 AC_SUBST(EVENTS_LIBS)
 
-AC_CHECK_HEADER(events.h,
-   [AC_CHECK_LIB(events, event_context_init, [EVENTS_LIBS="-levents"]) ],
-   [PKG_CHECK_MODULES(EVENTS, events)])
+AC_CHECK_HEADER(tevent.h,
+   [AC_CHECK_LIB(tevent, event_context_init, [EVENTS_LIBS="-ltevent"]) ],
+   [PKG_CHECK_MODULES(EVENTS, tevent)])
diff --git a/ldb/include/ldb.h b/ldb/include/ldb.h
index e2ec86987..cb42e8a66 100644
--- a/ldb/include/ldb.h
+++ b/ldb/include/ldb.h
@@ -46,6 +46,10 @@
 #define _LDB_H_ 1
 /*! \endcond */
 
+#include <stdbool.h>
+#include <talloc.h>
+#include <tevent.h>
+
 /*
   major restrictions as compared to normal LDAP:
 
diff --git a/ldb/include/ldb_includes.h b/ldb/include/ldb_includes.h
index 29c7b2dc5..b55350a9d 100644
--- a/ldb/include/ldb_includes.h
+++ b/ldb/include/ldb_includes.h
@@ -20,7 +20,7 @@
 #include "system/filesys.h"
 #include "system/time.h"
 #include "talloc.h"
-#include "events.h"
+#include "tevent.h"
 #include "ldb.h"
 #include "ldb_errors.h"
 #include "ldb_private.h"
diff --git a/ldb/ldb.mk b/ldb/ldb.mk
index 9d94434dc..66cdea15c 100644
--- a/ldb/ldb.mk
+++ b/ldb/ldb.mk
@@ -64,11 +64,11 @@ examples/ldifreader: examples/ldifreader.o
 # Python bindings
 build-python:: ldb.$(SHLIBEXT)
 
-ldb_wrap.o: $(ldbdir)/ldb_wrap.c
-	$(CC) $(PICFLAG) -c $(ldbdir)/ldb_wrap.c $(CFLAGS) `$(PYTHON_CONFIG) --cflags`
+pyldb.o: $(ldbdir)/pyldb.c
+	$(CC) $(PICFLAG) -c $(ldbdir)/pyldb.c $(CFLAGS) `$(PYTHON_CONFIG) --cflags`
 	
-ldb.$(SHLIBEXT): ldb_wrap.o
-	$(SHLD) $(SHLD_FLAGS) -o ldb.$(SHLIBEXT) ldb_wrap.o $(LIB_FLAGS) `$(PYTHON_CONFIG) --ldflags`
+ldb.$(SHLIBEXT): pyldb.o
+	$(SHLD) $(SHLD_FLAGS) -o ldb.$(SHLIBEXT) pyldb.o $(LIB_FLAGS) `$(PYTHON_CONFIG) --ldflags`
 
 install-python:: build-python
 	mkdir -p $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='$(prefix)')"`
diff --git a/ldb/ldb.pc b/ldb/ldb.pc
index cf986a0f5..0d439df5b 100644
--- a/ldb/ldb.pc
+++ b/ldb/ldb.pc
@@ -1,16 +1,16 @@
-prefix=/usr/local/samba
+prefix=/usr/local
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
-modulesdir=${prefix}/modules
+modulesdir=@modulesdir@
 
 Name: ldb
 Description: An LDAP-like embedded database
-Version: 4
+Version: 0.9.2
 Requires.private: tdb
 Requires: talloc 
 Libs: -L${libdir} -lldb
-Libs.private: @LDAP_LIBS@
+Libs.private: -llber -lldap
 Cflags: -I${includedir} 
 Modulesdir: ${modulesdir}
 URL: http://ldb.samba.org/
diff --git a/ldb/pyldb.c b/ldb/pyldb.c
index dfabed54e..725477232 100644
--- a/ldb/pyldb.c
+++ b/ldb/pyldb.c
@@ -28,7 +28,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include "pyldb.h"
-#include "events.h"
+#include "tevent.h"
 #include "ldb.h"
 #include "ldb_errors.h"
 #include "ldb_private.h"