summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-11-16 08:35:48 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:45:28 +0100
commit15cb7772f8093d109df29e41bbbb134ac08158b5 (patch)
tree282012733bf1b084cc78f71faff897a898830ad9 /source4
parentd47be617692f0a40cd8b927020db18109cc5ee1b (diff)
downloadsamba-15cb7772f8093d109df29e41bbbb134ac08158b5.tar.gz
samba-15cb7772f8093d109df29e41bbbb134ac08158b5.tar.bz2
samba-15cb7772f8093d109df29e41bbbb134ac08158b5.zip
r25984: ldb: use MDLD macros from libreplace and use results to build share modules
metze (This used to be commit 113efcd85685e0c42eb51eb0370e789362c8071a)
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/ldb/Makefile.in7
-rw-r--r--source4/lib/ldb/configure.ac2
2 files changed, 7 insertions, 2 deletions
diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in
index dcff451ec5..31ab5c0b2d 100644
--- a/source4/lib/ldb/Makefile.in
+++ b/source4/lib/ldb/Makefile.in
@@ -47,6 +47,9 @@ CFLAGS=-g -I$(srcdir)/include -Iinclude -I$(srcdir) -I$(srcdir)/.. \
$(POPT_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) \
-DLIBDIR=\"$(libdir)\" -DSHLIBEXT=\"$(SHLIBEXT)\" -DUSE_MMAP=1 @CFLAGS@
+MDLD = @MDLD@
+MDLD_FLAGS = @MDLD_FLAGS@
+
LDB_LIB = $(STATICLIB)
LIB_FLAGS=$(LDFLAGS) -Llib $(LDB_LIB) $(LIBS) $(POPT_LIBS) $(TALLOC_LIBS) \
@@ -125,8 +128,8 @@ lib/libldb.a: $(OBJS)
lib/libnss_ldb.$(SHLIBEXT).2: $(NSS_OBJ) $(SOLIB)
$(CC) $(SHLD_FLAGS) -o $@ $(NSS_OBJ) $(LDFLAGS) $(SOLIB) @SONAMEFLAG@libnss_ldb.$(SHLIBEXT).2
-sample_module.$(SHLIBEXT): tests/sample_module.o
- $(CC) $(SHLD_FLAGS) $(LDFLAGS) -o $@ tests/sample_module.o
+sample_module.$(SHLIBEXT): tests/sample_module.o
+ $(MDLD) $(MDLD_FLAGS) -o $@ tests/sample_module.o
bin/ldbadd: tools/ldbadd.o tools/cmdline.o $(LIBS)
$(CC) -o bin/ldbadd tools/ldbadd.o tools/cmdline.o $(LIB_FLAGS) $(LD_EXPORT_DYNAMIC)
diff --git a/source4/lib/ldb/configure.ac b/source4/lib/ldb/configure.ac
index bf7b5b05a9..4a8e49489c 100644
--- a/source4/lib/ldb/configure.ac
+++ b/source4/lib/ldb/configure.ac
@@ -72,6 +72,8 @@ AC_LD_PICFLAG
AC_LD_SHLDFLAGS
AC_LD_SHLIBEXT
AC_LD_SONAMEFLAG
+AC_LIBREPLACE_MDLD
+AC_LIBREPLACE_MDLD_FLAGS
m4_include(libldb.m4)
AC_OUTPUT(Makefile ldb.pc)