summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2009-01-15 18:05:45 -0500
committerSimo Sorce <idra@samba.org>2009-01-15 18:05:45 -0500
commit6c5a1b037261c99f60a2d42c4b53ebbf85abd756 (patch)
tree708314717be3be415bed9453da4fddcce23765d3 /source4
parentefc487b80a28caa63c54d6dfd12580636e356dd8 (diff)
downloadsamba-6c5a1b037261c99f60a2d42c4b53ebbf85abd756.tar.gz
samba-6c5a1b037261c99f60a2d42c4b53ebbf85abd756.tar.bz2
samba-6c5a1b037261c99f60a2d42c4b53ebbf85abd756.zip
Fix LDB_MODULESDIR for ldb standalone builds
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/ldb/Makefile.in6
-rw-r--r--source4/lib/ldb/configure.ac2
2 files changed, 6 insertions, 2 deletions
diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in
index 6155f6e49c..6313fc1622 100644
--- 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 095caa5e92..7bc081cfe5 100644
--- 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=""