Fix LDB_MODULESDIR for ldb standalone builds

diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in
index 6155f6e49c5ad00c4ffc98591458a084541058ff..6313fc16221d71a168f7b51a77dfc8fdf5838595 100644 (file)
--- a/source4/lib/ldb/Makefile.in
+++ b/source4/lib/ldb/Makefile.in
@@ -24,6 +24,8 @@ PYTHON = @PYTHON@
 PYTHON_CONFIG = @PYTHON_CONFIG@
 ldbdir = $(srcdir)
 
+LDB_MODULESDIR = @LDB_MODULESDIR@
+
 TALLOC_LIBS = @TALLOC_LIBS@
 TALLOC_CFLAGS = @TALLOC_CFLAGS@
 TALLOC_OBJ = @TALLOC_OBJ@
@@ -56,7 +58,9 @@ LIBS = @LIBS@
 PICFLAG = @PICFLAG@
 CFLAGS=-g -I$(srcdir)/include -Iinclude -I$(srcdir) -I$(srcdir)/.. \
        $(POPT_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) $(TEVENT_CFLAGS) \
-       -DLIBDIR=\"$(libdir)\" -DSHLIBEXT=\"$(SHLIBEXT)\" -DUSE_MMAP=1 @CFLAGS@
+       -DLIBDIR=\"$(libdir)\" -DSHLIBEXT=\"$(SHLIBEXT)\" -DUSE_MMAP=1 \
+       -DLDB_MODULESDIR=\"$(LDB_MODULESDIR)\" \
+       @CFLAGS@
 
 MDLD = @MDLD@
 MDLD_FLAGS = @MDLD_FLAGS@

diff --git a/source4/lib/ldb/configure.ac b/source4/lib/ldb/configure.ac
index 095caa5e92eaca99f82b0ce8252125f37b12bc4b..7bc081cfe5ccf3d6e3f963fc49cf4c6e4a5302c1 100644 (file)
--- a/source4/lib/ldb/configure.ac
+++ b/source4/lib/ldb/configure.ac
@@ -37,7 +37,7 @@ AC_PATH_PROG(SLAPD,slapd)
 AC_CHECK_HEADERS(stdint.h dlfcn.h)
 AC_CONFIG_HEADER(include/config.h)
 
-AC_DEFINE_UNQUOTED(LDB_MODULESDIR, LIBDIR "/ldb" , [Modules directory] )
+LDB_MODULESDIR="${libdir}/ldb"
 AC_SUBST(LDB_MODULESDIR)
 
 TESTS=""