summaryrefslogtreecommitdiff
path: root/source3
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
commit07a5bd6027b6118906d78a2dd3d28efbb7d48406 (patch)
tree992592caf825d5485dc8030321cc9a5aba483e16 /source3
parent850ec9eb3a35e5140891be5ce0e2844ec45c3057 (diff)
downloadsamba-07a5bd6027b6118906d78a2dd3d28efbb7d48406.tar.gz
samba-07a5bd6027b6118906d78a2dd3d28efbb7d48406.tar.bz2
samba-07a5bd6027b6118906d78a2dd3d28efbb7d48406.zip
r25944: Fix handling of sonameflag on AIX, which doesn't have anything like that.
(cherry picked from parts of commit 228dd6830eb9c91287bb3e0233d8b3a404ff3676) Michael (This used to be commit 7a7dcd9b1265b8f031c9a5e9c4cfa89216827a28)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/replace/libreplace_ld.m44
-rw-r--r--source3/lib/talloc/Makefile.in2
-rw-r--r--source3/lib/tdb/Makefile.in2
3 files changed, 6 insertions, 2 deletions
diff --git a/source3/lib/replace/libreplace_ld.m4 b/source3/lib/replace/libreplace_ld.m4
index f0d10c1e3e..08defb091f 100644
--- a/source3/lib/replace/libreplace_ld.m4
+++ b/source3/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/source3/lib/talloc/Makefile.in b/source3/lib/talloc/Makefile.in
index 3da96cd457..619a8d008d 100644
--- a/source3/lib/talloc/Makefile.in
+++ b/source3/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/source3/lib/tdb/Makefile.in b/source3/lib/tdb/Makefile.in
index e1ecbb30ec..738d8566b5 100644
--- a/source3/lib/tdb/Makefile.in
+++ b/source3/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