From 961232bf7f720b98d6e3ac617fa5af14c17cad1f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 26 Mar 2006 01:37:31 +0000
Subject: r14737: Fix shared library build without --enable-developer (This
 used to be commit d508382180c586ec0a749883b2c75561732d6f37)

---
 source4/build/smb_build/makefile.pm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'source4/build/smb_build/makefile.pm')

diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index f002779128..0277eb658a 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -258,6 +258,8 @@ __EOD__
 		}
 	}
 
+	my $singlesoarg = "";
+	
 	if ($self->{duplicate_build}) {
 		$self->output(<< "__EOD__"
 #
@@ -277,6 +279,13 @@ __EOD__
 		}
 
 		$self->output("\n");
+	} else {
+		if ($self->{config}->{SONAMEFLAG} ne "" and 
+			defined($ctx->{LIBRARY_SONAME}) and 
+			$ctx->{LIBRARY_REALNAME} ne $ctx->{LIBRARY_SONAME}) {
+			$singlesoarg = "\n\t\@ln -fs $ctx->{LIBRARY_REALNAME} $installdir/$ctx->{LIBRARY_SONAME}";
+		}
+
 	}
 
 	$self->output(<< "__EOD__"
@@ -285,9 +294,9 @@ __EOD__
 $installdir/$ctx->{LIBRARY_REALNAME}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST) $init_obj
 	\@echo Linking \$\@
 	\@mkdir -p $installdir
-	\@\$(SHLD) \$(SHLD_FLAGS) -o \$\@ \\
+	\@\$(SHLD) \$(SHLD_FLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
 		\$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) $soarg \\
-		$init_obj \$($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST)
+		$init_obj \$($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST)$singlesoarg
 
 __EOD__
 );
-- 
cgit