summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-11-06 18:25:34 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:44:37 +0100
commit2ca86c77699a50f7861095ad8c1c94cba8f20e01 (patch)
treeb9650c6671651d12052dd30df8cfdf3872c09354 /source4/lib
parentb05601f568b9f6012146415b0d2f8c626c5c5e13 (diff)
downloadsamba-2ca86c77699a50f7861095ad8c1c94cba8f20e01.tar.gz
samba-2ca86c77699a50f7861095ad8c1c94cba8f20e01.tar.bz2
samba-2ca86c77699a50f7861095ad8c1c94cba8f20e01.zip
r25880: Try to get some more flags right.
(This used to be commit bbc36fd3f693480e3ea01c5c9e858008a4f3c229)
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/ldb/Makefile.in4
-rw-r--r--source4/lib/replace/libreplace_ld.m48
2 files changed, 6 insertions, 6 deletions
diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in
index c0954f8bf1..72bb957555 100644
--- a/source4/lib/ldb/Makefile.in
+++ b/source4/lib/ldb/Makefile.in
@@ -97,7 +97,7 @@ SOLIB = lib/libldb.$(SHLIBEXT).0.9.0
STATICLIB = lib/libldb.a
$(SOLIB): $(OBJS)
- $(CC) $(SHLD_FLAGS) $(SONAMEFLAG)$(SONAME) -o $@ $^ @LDFLAGS@ @LIBS@ $(TALLOC_LIBS) $(TDB_LIBS)
+ $(CC) $(SHLD_FLAGS) $(SONAMEFLAG)$(SONAME) -o $@ $^ $(LDFLAGS) $(LIBS) $(TALLOC_LIBS) $(TDB_LIBS)
all: showflags dirs $(OBJS) $(STATICLIB) $(SOLIB) $(BINS) $(EXAMPLES) manpages
@@ -124,7 +124,7 @@ lib/libldb.a: $(OBJS)
@-ranlib $@
lib/libnss_ldb.$(SHLIBEXT).2: $(NSS_OBJ) $(LIBS) bin/libldb.a
- $(CC) $(SHLD_FLAGS) -Wl,-soname,libnss_ldb.$(SHLIBEXT).2 -o lib/libnss_ldb.$(SHLIBEXT).2 $(NSS_OBJ) $(OBJS) $(LIB_FLAGS)
+ $(CC) $(SHLD_FLAGS) $(SONAMEFLAG)libnss_ldb.$(SHLIBEXT).2 -o lib/libnss_ldb.$(SHLIBEXT).2 $(NSS_OBJ) $(OBJS) $(LIB_FLAGS)
sample_module.$(SHLIBEXT): tests/sample_module.o
$(CC) $(SHLD_FLAGS) $(LIBS) $(LDFLAGS) -o $@ tests/sample_module.o
diff --git a/source4/lib/replace/libreplace_ld.m4 b/source4/lib/replace/libreplace_ld.m4
index c276a7a864..8147e692ec 100644
--- a/source4/lib/replace/libreplace_ld.m4
+++ b/source4/lib/replace/libreplace_ld.m4
@@ -8,7 +8,7 @@ else
hpux* )
LD_EXPORT_DYNAMIC="-Wl,-E"
;;
- * )
+ *)
LD_EXPORT_DYNAMIC=""
;;
esac
@@ -101,7 +101,7 @@ AC_DEFUN([AC_LD_SHLDFLAGS],
SHLD_FLAGS="-b -Wl,-B,symbolic,-b,-z"
;;
*darwin*)
- SHLD_FLAGS="-bundle -flat_namespace -undefined suppress"
+ SHLD_FLAGS="-dynamiclib"
;;
esac
@@ -150,7 +150,7 @@ AC_DEFUN([AC_LD_SONAMEFLAG],
SONAMEFLAG="-Wl,-soname,"
;;
*irix*)
- SONAMEFLAG="-soname "
+ SONAMEFLAG="-Wl,-soname,"
;;
*hpux*)
SONAMEFLAG="-Wl,+h "
@@ -162,7 +162,7 @@ AC_DEFUN([AC_LD_SONAMEFLAG],
SONAMEFLAG="-Wl,-soname,"
;;
*darwin*)
- SONAMEFLAG="-Wl,-soname,"
+ SONAMEFLAG="-install_name "
;;
esac
])