r25992: ldb: use AC_LIBREPLACE_SHLD and use it for linking shared libraries

metze

diff --git a/source/lib/ldb/Makefile.in b/source/lib/ldb/Makefile.in
index 31ab5c0b2d7356fc17d68d99c16489f7761bd2bb..22ad9a20bef3947606651618a44929b1356de768 100644 (file)
--- a/source/lib/ldb/Makefile.in
+++ b/source/lib/ldb/Makefile.in
@@ -37,6 +37,7 @@ LIBDL = @LIBDL@
 SHLIBEXT = @SHLIBEXT@
 
 LD_EXPORT_DYNAMIC = @LD_EXPORT_DYNAMIC@
+SHLD = @SHLD@
 SHLD_FLAGS = @SHLD_FLAGS@
 
 LDFLAGS = @LDFLAGS@
@@ -99,7 +100,7 @@ SOLIB = lib/libldb.$(SHLIBEXT).0.9.0
 STATICLIB = lib/libldb.a
 
 $(SOLIB): $(OBJS)
-       $(CC) $(SHLD_FLAGS) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) $(TALLOC_LIBS) $(TDB_LIBS) $(LDAP_LIBS) @SONAMEFLAG@$(SONAME)
+       $(SHLD) $(SHLD_FLAGS) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) $(TALLOC_LIBS) $(TDB_LIBS) $(LDAP_LIBS) @SONAMEFLAG@$(SONAME)
 
 all: showflags dirs $(OBJS) $(STATICLIB) $(SOLIB) $(BINS) $(EXAMPLES) manpages
 
@@ -126,7 +127,7 @@ lib/libldb.a: $(OBJS)
        @-ranlib $@
 
 lib/libnss_ldb.$(SHLIBEXT).2: $(NSS_OBJ) $(SOLIB)
-       $(CC) $(SHLD_FLAGS) -o $@ $(NSS_OBJ) $(LDFLAGS) $(SOLIB) @SONAMEFLAG@libnss_ldb.$(SHLIBEXT).2
+       $(SHLD) $(SHLD_FLAGS) -o $@ $(NSS_OBJ) $(LDFLAGS) $(SOLIB) @SONAMEFLAG@libnss_ldb.$(SHLIBEXT).2
 
 sample_module.$(SHLIBEXT): tests/sample_module.o
        $(MDLD) $(MDLD_FLAGS) -o $@ tests/sample_module.o

diff --git a/source/lib/ldb/configure.ac b/source/lib/ldb/configure.ac
index 8772c8779a7774cf068b407d10d091f6690ec38d..73966e8f93316243ecb632bbbe85526df34bdf92 100644 (file)
--- a/source/lib/ldb/configure.ac
+++ b/source/lib/ldb/configure.ac
@@ -71,6 +71,7 @@ AC_LD_EXPORT_DYNAMIC
 AC_LD_PICFLAG
 AC_LD_SHLIBEXT
 AC_LD_SONAMEFLAG
+AC_LIBREPLACE_SHLD
 AC_LIBREPLACE_SHLD_FLAGS
 AC_LIBREPLACE_MDLD
 AC_LIBREPLACE_MDLD_FLAGS