summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-11-16 10:19:46 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:45:31 +0100
commit5b79c134c194363964cb50ce2ae1c595d808936c (patch)
treeb67fc6068792a0249a529dbcf3ac5832f3ceb24d
parent08d4a44f927b52bcb16c8cc81cf849dcffa01061 (diff)
downloadsamba-5b79c134c194363964cb50ce2ae1c595d808936c.tar.gz
samba-5b79c134c194363964cb50ce2ae1c595d808936c.tar.xz
samba-5b79c134c194363964cb50ce2ae1c595d808936c.zip
r25991: tdb: use AC_LIBREPLACE_SHLD and use it for linking the shared library
metze (This used to be commit 1f2ba20a11f5f34235d8067c72f8d79486db0f01)
-rw-r--r--source4/lib/tdb/Makefile.in3
-rw-r--r--source4/lib/tdb/configure.ac1
2 files changed, 3 insertions, 1 deletions
diff --git a/source4/lib/tdb/Makefile.in b/source4/lib/tdb/Makefile.in
index 1d940d3adc..2a1df7829c 100644
--- a/source4/lib/tdb/Makefile.in
+++ b/source4/lib/tdb/Makefile.in
@@ -16,6 +16,7 @@ CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/include -Iinclude
CFLAGS = $(CPPFLAGS) @CFLAGS@
LDFLAGS = @LDFLAGS@
EXEEXT = @EXEEXT@
+SHLD = @SHLD@
SHLD_FLAGS = @SHLD_FLAGS@
PACKAGE_VERSION = @PACKAGE_VERSION@
PICFLAG = @PICFLAG@
@@ -73,7 +74,7 @@ $(SONAME): $(SOLIB)
ln -s $< $@
$(SOLIB): $(TDB_OBJ)
- $(CC) $(SHLD_FLAGS) -o $@ $(TDB_OBJ) @SONAMEFLAG@$(SONAME)
+ $(SHLD) $(SHLD_FLAGS) -o $@ $(TDB_OBJ) @SONAMEFLAG@$(SONAME)
TDB_LIB = libtdb.a
diff --git a/source4/lib/tdb/configure.ac b/source4/lib/tdb/configure.ac
index e081092fcf..cc86b51e7e 100644
--- a/source4/lib/tdb/configure.ac
+++ b/source4/lib/tdb/configure.ac
@@ -9,6 +9,7 @@ AC_LIBREPLACE_ALL_CHECKS
AC_LD_SONAMEFLAG
AC_LD_PICFLAG
AC_LD_SHLIBEXT
+AC_LIBREPLACE_SHLD
AC_LIBREPLACE_SHLD_FLAGS
m4_include(libtdb.m4)
AC_OUTPUT(Makefile tdb.pc)