From 19e4588ed76d6832be4de0813b6108a292ef413a Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 25 Sep 2008 01:22:47 +0000
Subject: [PATCH] 2451.   [port]          solaris: handle runtime linking
 better. [RT #18356]

---
 CHANGES      |  2 ++
 configure.in | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 76ef49fbcb..7fd9c046de 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2451.	[port]		solaris: handle runtime linking better. [RT #18356]
+
 2450.	[doc]		Fix lwresd docbook problem for manual page.
 			[RT #18672]
 
diff --git a/configure.in b/configure.in
index b9f840ca27..7047104687 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.449 $)
+AC_REVISION($Revision: 1.450 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.59)
@@ -2757,6 +2757,10 @@ for e in $BUILD_LDFLAGS ; do
 		    ee=`echo $e | sed -e 's%^-L%-Wl,-rpath,%'`
 		    NEWFLAGS="$NEWFLAGS $e $ee"
 		    ;;
+		solaris*)
+		    ee=echo $e | sed -e 's%^-L%-R%'`
+		    NEWFLAGS="$NEWFLAGS $e $ee"
+		    ;;
 		*)
 		    NEWFLAGS="$NEWFLAGS $e"
 		    ;;
@@ -2782,6 +2786,10 @@ for e in $DNS_GSSAPI_LIBS ; do
 		    ee=`echo $e | sed -e 's%^-L%-Wl,-rpath,%'`
 		    NEWFLAGS="$NEWFLAGS $e $ee"
 		    ;;
+		solaris*)
+		    ee=echo $e | sed -e 's%^-L%-R%'`
+		    NEWFLAGS="$NEWFLAGS $e $ee"
+		    ;;
 		*)
 		    NEWFLAGS="$NEWFLAGS $e"
 		    ;;
@@ -2807,6 +2815,10 @@ for e in $DNS_CRYPTO_LIBS ; do
 		    ee=`echo $e | sed -e 's%^-L%-Wl,-rpath,%'`
 		    NEWFLAGS="$NEWFLAGS $e $ee"
 		    ;;
+		solaris*)
+		    ee=echo $e | sed -e 's%^-L%-R%'`
+		    NEWFLAGS="$NEWFLAGS $e $ee"
+		    ;;
 		*)
 		    NEWFLAGS="$NEWFLAGS $e"
 		    ;;