diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-11-16 10:21:57 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:45:31 +0100 |
| commit | ff23cad8e33c5e64a3fd063d4bfc90953144c3d8 (patch) | |
| tree | 69c41b19009e50f8cafee9b8f2dbe70bd7a514c8 | |
| parent | 5b79c134c194363964cb50ce2ae1c595d808936c (diff) | |
| download | samba-ff23cad8e33c5e64a3fd063d4bfc90953144c3d8.tar.gz samba-ff23cad8e33c5e64a3fd063d4bfc90953144c3d8.tar.bz2 samba-ff23cad8e33c5e64a3fd063d4bfc90953144c3d8.zip | |
r25992: ldb: use AC_LIBREPLACE_SHLD and use it for linking shared libraries
metze
(This used to be commit 7ee9700abea3e0b5c5f0a6f4941e7e41188edaaf)
| -rw-r--r-- | source4/lib/ldb/Makefile.in | 5 | ||||
| -rw-r--r-- | source4/lib/ldb/configure.ac | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in index 31ab5c0b2d..22ad9a20be 100644 --- a/source4/lib/ldb/Makefile.in +++ b/source4/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/source4/lib/ldb/configure.ac b/source4/lib/ldb/configure.ac index 8772c8779a..73966e8f93 100644 --- a/source4/lib/ldb/configure.ac +++ b/source4/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 |