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

(cherry picked from parts of commit 228dd6830eb9c91287bb3e0233d8b3a404ff3676)

Michael

diff --git a/source/lib/replace/libreplace_ld.m4 b/source/lib/replace/libreplace_ld.m4
index f0d10c1e3e334b9feef3b1680052a7599edc7212..08defb091fc97dc358a828a16f96b8bbda2bdb4c 100644 (file)
--- 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 3da96cd457a11b14012b925bfb528dfd3c1242de..619a8d008dffb330b94a1c8f75c7639d34c1f7b2 100644 (file)
--- 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 e1ecbb30ec880fb71f64dad7f2b86f8d18dbf10f..738d8566b5194e0a3edea4f3cf4bd79b1cd64ccc 100644 (file)
--- 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