s3:Makefile Link in correct code for merged ldb

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 7f710ff06435394182a3f37f2db92bbe3cff152f..ec7c04b2c6b37460b1c5ac70873dd08fdd3dee11 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -168,7 +168,9 @@ FLAGS = -I. \
        $(CPPFLAGS) \
        $(ISA) \
        -I$(srcdir)/lib \
+       -I$(srcdir)/lib \
        -I.. \
+       -I../lib/ldb/include \
        -I../source4 \
        -D_SAMBA_BUILD_=3
 
@@ -1135,7 +1137,6 @@ LDB_TDB_OBJ=../lib/ldb/ldb_tdb/ldb_tdb.o \
        ../lib/ldb/ldb_tdb/ldb_cache.o ../lib/ldb/ldb_tdb/ldb_tdb_wrap.o
 
 LDB_MODULES_OBJ=../lib/ldb/modules/operational.o ../lib/ldb/modules/rdn_name.o \
-          ../lib/ldb/modules/objectclass.o \
           ../lib/ldb/modules/paged_results.o ../lib/ldb/modules/sort.o ../lib/ldb/modules/asq.o
 
 # enabled in configure.in

diff --git a/source3/samba4.m4 b/source3/samba4.m4
index f514cad142b04d14a65cbcd4c4ff100f7e04050b..b02767a2aab165fdaa49450273ede61579d55ee5 100644 (file)
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -121,7 +121,7 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb = LDB_REQUIRED_VERSION,
                m4_include(../lib/ldb/sqlite3.m4)
                m4_include(../lib/ldb/libldb.m4)
                SMB_INCLUDE_MK(../lib/ldb/config.mk)
-               AC_CONFIG_FILES(../source4/lib/ldb/ldb.pc)
+               AC_CONFIG_FILES(../lib/ldb/ldb.pc)
        ]
 )
 SMB_INCLUDE_MK(../lib/ldb/python.mk)