summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-11-16 10:17:26 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:45:31 +0100
commit08d4a44f927b52bcb16c8cc81cf849dcffa01061 (patch)
treed751c2d02b8a3a60c5fe90dc88564fdf19916842
parent17f5426395bab287802f9d9d234f049313a3fa07 (diff)
downloadsamba-08d4a44f927b52bcb16c8cc81cf849dcffa01061.tar.gz
samba-08d4a44f927b52bcb16c8cc81cf849dcffa01061.tar.bz2
samba-08d4a44f927b52bcb16c8cc81cf849dcffa01061.zip
r25990: talloc: use AC_LIBREPLACE_SHLD and use it for linking the shared library
metze (This used to be commit c179807165b84dd832ab64f794034960668e5957)
-rw-r--r--source4/lib/talloc/Makefile.in3
-rw-r--r--source4/lib/talloc/configure.ac1
2 files changed, 3 insertions, 1 deletions
diff --git a/source4/lib/talloc/Makefile.in b/source4/lib/talloc/Makefile.in
index 6eee227f7a..7110b04e12 100644
--- a/source4/lib/talloc/Makefile.in
+++ b/source4/lib/talloc/Makefile.in
@@ -17,6 +17,7 @@ EXTRA_TARGETS = @DOC_TARGET@
PICFLAG = @PICFLAG@
PACKAGE_VERSION = @PACKAGE_VERSION@
SHLIBEXT = @SHLIBEXT@
+SHLD = @SHLD@
SHLD_FLAGS = @SHLD_FLAGS@
.SUFFIXES: .c .o .3 .3.xml .xml .html
@@ -44,7 +45,7 @@ libtalloc.a: $(LIBOBJ)
@-ranlib $@
$(SOLIB): $(LIBOBJ)
- $(CC) $(SHLD_FLAGS) -o $@ $(LIBOBJ) @SONAMEFLAG@$(SONAME)
+ $(SHLD) $(SHLD_FLAGS) -o $@ $(LIBOBJ) @SONAMEFLAG@$(SONAME)
install: all
${INSTALLCMD} -d $(DESTDIR)$(libdir)
diff --git a/source4/lib/talloc/configure.ac b/source4/lib/talloc/configure.ac
index e5f9575f22..7878d59300 100644
--- a/source4/lib/talloc/configure.ac
+++ b/source4/lib/talloc/configure.ac
@@ -18,6 +18,7 @@ AC_SUBST(DOC_TARGET)
AC_LD_PICFLAG
AC_LD_SHLIBEXT
AC_LD_SONAMEFLAG
+AC_LIBREPLACE_SHLD
AC_LIBREPLACE_SHLD_FLAGS
AC_OUTPUT(Makefile talloc.pc)