summaryrefslogtreecommitdiff
path: root/ldb
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2008-12-22 16:34:37 -0500
committerSimo Sorce <idra@samba.org>2008-12-22 19:12:10 -0500
commitc1f88421710e7a90773b481bfa07129fcdd42663 (patch)
treeeb08a52ea2ffc212db8cff1f611e77b218a17599 /ldb
parent41718e315ea78998fab0893fd5f148a49d8faab8 (diff)
downloadsssd-c1f88421710e7a90773b481bfa07129fcdd42663.tar.gz
sssd-c1f88421710e7a90773b481bfa07129fcdd42663.tar.bz2
sssd-c1f88421710e7a90773b481bfa07129fcdd42663.zip
Add some build fixes on top of the talloc, tdb, tevent, ldb rebases
Diffstat (limited to 'ldb')
-rw-r--r--ldb/Makefile.in4
-rw-r--r--ldb/external/libevents.m46
-rw-r--r--ldb/include/ldb.h4
-rw-r--r--ldb/include/ldb_includes.h2
-rw-r--r--ldb/ldb.mk8
-rw-r--r--ldb/ldb.pc8
-rw-r--r--ldb/pyldb.c2
7 files changed, 19 insertions, 15 deletions
diff --git a/ldb/Makefile.in b/ldb/Makefile.in
index d97ca8bd..3215acb5 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 4fd2e71e..2aabb06d 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 e2ec8698..cb42e8a6 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 29c7b2dc..b55350a9 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 9d94434d..66cdea15 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 cf986a0f..0d439df5 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 dfabed54..72547723 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"