summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-11-14 01:01:31 +0100
committerMichael Adam <obnox@samba.org>2008-02-13 01:40:10 +0100
commit7a7dcd9b1265b8f031c9a5e9c4cfa89216827a28 (patch)
tree49a4242f7e44e8762a47e1834699233fc7e6de04
parent42b56f77ff88f8a9dccd7a8ac7df789d0223c945 (diff)
downloadsamba-7a7dcd9b1265b8f031c9a5e9c4cfa89216827a28.tar.gz
r25944: Fix handling of sonameflag on AIX, which doesn't have anything like that.
(cherry picked from parts of commit 228dd6830eb9c91287bb3e0233d8b3a404ff3676) Michael
-rw-r--r--source/lib/replace/libreplace_ld.m44
-rw-r--r--source/lib/talloc/Makefile.in2
-rw-r--r--source/lib/tdb/Makefile.in2
3 files changed, 6 insertions, 2 deletions
diff --git a/source/lib/replace/libreplace_ld.m4 b/source/lib/replace/libreplace_ld.m4
index f0d10c1e3e3..08defb091fc 100644
--- a/source/lib/replace/libreplace_ld.m4
+++ b/source/lib/replace/libreplace_ld.m4
@@ -246,6 +246,10 @@ AC_DEFUN([AC_LD_SONAMEFLAG],
# Not supported
SONAMEFLAG="#"
;;
+ *aix*)
+ # Not supported
+ SONAMEFLAG="#"
+ ;;
esac
])
diff --git a/source/lib/talloc/Makefile.in b/source/lib/talloc/Makefile.in
index 3da96cd457a..619a8d008df 100644
--- a/source/lib/talloc/Makefile.in
+++ b/source/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/source/lib/tdb/Makefile.in b/source/lib/tdb/Makefile.in
index e1ecbb30ec8..738d8566b51 100644
--- a/source/lib/tdb/Makefile.in
+++ b/source/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