[SCM] Samba Shared Repository - branch master updated - 6c5a1b037261c99f60a2d42c4b53ebbf85abd756

[Simo Sorce]

The branch, master has been updated
       via  6c5a1b037261c99f60a2d42c4b53ebbf85abd756 (commit)
      from  efc487b80a28caa63c54d6dfd12580636e356dd8 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6c5a1b037261c99f60a2d42c4b53ebbf85abd756
Author: Simo Sorce <idra at samba.org>
Date:   Thu Jan 15 18:05:45 2009 -0500

    Fix LDB_MODULESDIR for ldb standalone builds

-----------------------------------------------------------------------

Summary of changes:
 source4/lib/ldb/Makefile.in  |    6 +++++-
 source4/lib/ldb/configure.ac |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in
index 6155f6e..6313fc1 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 095caa5..7bc081c 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=""


-- 
Samba Shared Repository