svn commit: samba r25944 - in branches/SAMBA_4_0: . source/build/smb_build source/lib/ldb source/lib/replace source/lib/talloc source/lib/tdb

[jelmer at samba.org]

Author: jelmer
Date: 2007-11-14 01:01:31 +0000 (Wed, 14 Nov 2007)
New Revision: 25944

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25944

Log:
Fix handling of sonameflag on AIX, which doesn't have anything like that.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm
   branches/SAMBA_4_0/source/lib/ldb/Makefile.in
   branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4
   branches/SAMBA_4_0/source/lib/talloc/Makefile.in
   branches/SAMBA_4_0/source/lib/tdb/Makefile.in


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2007-11-14 00:22:31 UTC (rev 25943)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2007-11-14 01:01:31 UTC (rev 25944)
@@ -364,7 +364,7 @@
 
 	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 @@
 		}
 	}
 
-	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}";

Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/Makefile.in	2007-11-14 00:22:31 UTC (rev 25943)
+++ branches/SAMBA_4_0/source/lib/ldb/Makefile.in	2007-11-14 01:01:31 UTC (rev 25944)
@@ -97,7 +97,7 @@
 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
 

Modified: branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4	2007-11-14 00:22:31 UTC (rev 25943)
+++ branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4	2007-11-14 01:01:31 UTC (rev 25944)
@@ -168,5 +168,9 @@
 		*darwin*)
 			SONAMEFLAG="-install_name "
 			;;
+		*aix*)
+			# Not supported
+			SONAMEFLAG="#"
+			;;
 		esac
 ])

Modified: branches/SAMBA_4_0/source/lib/talloc/Makefile.in
===================================================================
--- branches/SAMBA_4_0/source/lib/talloc/Makefile.in	2007-11-14 00:22:31 UTC (rev 25943)
+++ branches/SAMBA_4_0/source/lib/talloc/Makefile.in	2007-11-14 01:01:31 UTC (rev 25944)
@@ -45,7 +45,7 @@
 	@-ranlib $@
 
 $(SOLIB): $(LIBOBJ)
-	$(CC) $(SHLD_FLAGS) $(SONAMEFLAG)$(SONAME) -o $@ $^
+	$(CC) $(SHLD_FLAGS) -o $@ $^ $(SONAMEFLAG)$(SONAME)
 
 install: all 
 	${INSTALLCMD} -d $(DESTDIR)$(libdir)

Modified: branches/SAMBA_4_0/source/lib/tdb/Makefile.in
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/Makefile.in	2007-11-14 00:22:31 UTC (rev 25943)
+++ branches/SAMBA_4_0/source/lib/tdb/Makefile.in	2007-11-14 01:01:31 UTC (rev 25944)
@@ -74,7 +74,7 @@
 	ln -s $< $@
 
 $(SOLIB): $(TDB_OBJ)
-	$(CC) $(SHLD_FLAGS) $(SONAMEFLAG)$(SONAME) -o $@ $^
+	$(CC) $(SHLD_FLAGS) -o $@ $^ $(SONAMEFLAG)$(SONAME) 
 
 TDB_LIB = libtdb.a