r25944: Fix handling of sonameflag on AIX, which doesn't have anything like that.

(This used to be commit 228dd6830eb9c91287bb3e0233d8b3a404ff3676)

diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 1829c256b3b09b76ee4bb400d6cbbf9d624528d7..5f56fb6ddfdb33ad7ccc64c507d6f6b12b97a0d6 100644 (file)
--- 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 72bb95755526f1a4a33092613a08d23356b458de..6a490e2f1503c57c6cba904962ec6631ac04f759 100644 (file)
--- 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 35d09d0652860cc49d28f1b9086496e3df9a695a..a8bc22cb5be76c62c567292c1e567c17a6d9cd0f 100644 (file)
--- 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 3da96cd457a11b14012b925bfb528dfd3c1242de..619a8d008dffb330b94a1c8f75c7639d34c1f7b2 100644 (file)
--- 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 e1ecbb30ec880fb71f64dad7f2b86f8d18dbf10f..738d8566b5194e0a3edea4f3cf4bd79b1cd64ccc 100644 (file)
--- 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