summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-11-14 01:01:31 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:45:12 +0100
commit0969ac9e6189d1b990ca86b7611341fe6a404b5e (patch)
tree5b1d79df060accc0a8ef50b0e05c4602207fade3 /source4
parent5adade2f2f6db9f76c5d1bfbb08d9c0b17d454a9 (diff)
downloadsamba-0969ac9e6189d1b990ca86b7611341fe6a404b5e.tar.gz
samba-0969ac9e6189d1b990ca86b7611341fe6a404b5e.tar.bz2
samba-0969ac9e6189d1b990ca86b7611341fe6a404b5e.zip
r25944: Fix handling of sonameflag on AIX, which doesn't have anything like that.
(This used to be commit 228dd6830eb9c91287bb3e0233d8b3a404ff3676)
Diffstat (limited to 'source4')
-rw-r--r--source4/build/smb_build/makefile.pm4
-rw-r--r--source4/lib/ldb/Makefile.in2
-rw-r--r--source4/lib/replace/libreplace_ld.m44
-rw-r--r--source4/lib/talloc/Makefile.in2
-rw-r--r--source4/lib/tdb/Makefile.in2
5 files changed, 9 insertions, 5 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 1829c256b3..5f56fb6ddf 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -364,7 +364,7 @@ __EOD__
my $soarg = "";
my $lns = "";
- if ($self->{config}->{SONAMEFLAG} ne "" and defined($ctx->{LIBRARY_SONAME})) {
+ if ($self->{config}->{SONAMEFLAG} ne "#" and defined($ctx->{LIBRARY_SONAME})) {
$soarg = "$self->{config}->{SONAMEFLAG}$ctx->{LIBRARY_SONAME} ";
if ($ctx->{LIBRARY_REALNAME} ne $ctx->{LIBRARY_SONAME}) {
$lns .= "\n\t\@rm -f $ctx->{SHAREDDIR}/$ctx->{LIBRARY_SONAME}";
@@ -372,7 +372,7 @@ __EOD__
}
}
- if ($self->{config}->{SONAMEFLAG} ne "" and
+ if ($self->{config}->{SONAMEFLAG} ne "#" and
defined($ctx->{LIBRARY_SONAME}) and
$ctx->{LIBRARY_REALNAME} ne $ctx->{LIBRARY_SONAME}) {
$lns .= "\n\t\@rm -f $ctx->{SHAREDDIR}/$ctx->{LIBRARY_SONAME}";
diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in
index 72bb957555..6a490e2f15 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) -o $@ $^ $(LDFLAGS) $(LIBS) $(TALLOC_LIBS) $(TDB_LIBS) $(SONAMEFLAG)$(SONAME)
all: showflags dirs $(OBJS) $(STATICLIB) $(SOLIB) $(BINS) $(EXAMPLES) manpages
diff --git a/source4/lib/replace/libreplace_ld.m4 b/source4/lib/replace/libreplace_ld.m4
index 35d09d0652..a8bc22cb5b 100644
--- a/source4/lib/replace/libreplace_ld.m4
+++ b/source4/lib/replace/libreplace_ld.m4
@@ -168,5 +168,9 @@ AC_DEFUN([AC_LD_SONAMEFLAG],
*darwin*)
SONAMEFLAG="-install_name "
;;
+ *aix*)
+ # Not supported
+ SONAMEFLAG="#"
+ ;;
esac
])
diff --git a/source4/lib/talloc/Makefile.in b/source4/lib/talloc/Makefile.in
index 3da96cd457..619a8d008d 100644
--- a/source4/lib/talloc/Makefile.in
+++ b/source4/lib/talloc/Makefile.in
@@ -45,7 +45,7 @@ libtalloc.a: $(LIBOBJ)
@-ranlib $@
$(SOLIB): $(LIBOBJ)
- $(CC) $(SHLD_FLAGS) $(SONAMEFLAG)$(SONAME) -o $@ $^
+ $(CC) $(SHLD_FLAGS) -o $@ $^ $(SONAMEFLAG)$(SONAME)
install: all
${INSTALLCMD} -d $(DESTDIR)$(libdir)
diff --git a/source4/lib/tdb/Makefile.in b/source4/lib/tdb/Makefile.in
index e1ecbb30ec..738d8566b5 100644
--- a/source4/lib/tdb/Makefile.in
+++ b/source4/lib/tdb/Makefile.in
@@ -74,7 +74,7 @@ $(SONAME): $(SOLIB)
ln -s $< $@
$(SOLIB): $(TDB_OBJ)
- $(CC) $(SHLD_FLAGS) $(SONAMEFLAG)$(SONAME) -o $@ $^
+ $(CC) $(SHLD_FLAGS) -o $@ $^ $(SONAMEFLAG)$(SONAME)
TDB_LIB = libtdb.a