From df3063630aa1bd96e7260cdeb2927d53c7ecf4d3 Mon Sep 17 00:00:00 2001
From: thorpej <thorpej>
Date: Fri, 4 Jun 1999 07:11:57 +0000
Subject: Make sure Rpath is supplied for X libraries.

---
 security/ssh/patches/patch-aj | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

(limited to 'security')

diff --git a/security/ssh/patches/patch-aj b/security/ssh/patches/patch-aj
index a533146aac3..5d207e165f1 100644
--- a/security/ssh/patches/patch-aj
+++ b/security/ssh/patches/patch-aj
@@ -1,8 +1,6 @@
-$NetBSD: patch-aj,v 1.6 1999/05/10 21:34:46 tron Exp $
-
---- configure.orig	Mon May 10 23:27:27 1999
-+++ configure	Mon May 10 23:27:53 1999
-@@ -1996,12 +1996,6 @@
+--- configure.orig	Wed May 12 04:20:06 1999
++++ configure	Thu Jun  3 23:59:18 1999
+@@ -1989,12 +1989,6 @@
  
  export CFLAGS CC
  
@@ -14,8 +12,17 @@ $NetBSD: patch-aj,v 1.6 1999/05/10 21:34:46 tron Exp $
 -
  
  echo $ac_n "checking that the compiler works""... $ac_c" 1>&6
- echo "configure:2008: checking that the compiler works" >&5
-@@ -6611,8 +6605,8 @@
+ echo "configure:2001: checking that the compiler works" >&5
+@@ -4997,7 +4991,7 @@
+ 
+   # It would also be nice to do this for all -L options, not just this one.
+   if test -n "$x_libraries"; then
+-    X_LIBS="$X_LIBS -L$x_libraries"
++    X_LIBS="$X_LIBS -L$x_libraries -Wl,-R$x_libraries"
+     # For Solaris; some versions of Sun CC require a space after -R and
+     # others require no space.  Words are not sufficient . . . .
+     case "`(uname -sr) 2>/dev/null`" in
+@@ -6604,8 +6598,8 @@
  #define HAVE_TIS 1
  EOF
  
@@ -26,7 +33,7 @@ $NetBSD: patch-aj,v 1.6 1999/05/10 21:34:46 tron Exp $
      echo "configure: warning: Remember to read README.TIS. The connection between sshd and TIS authentication
  server is clear text!" 1>&2
      ;;
-@@ -7344,15 +7338,15 @@
+@@ -7295,15 +7289,15 @@
     case "$enableval" in
    no)
         echo "$ac_t""no" 1>&6
@@ -45,7 +52,7 @@ $NetBSD: patch-aj,v 1.6 1999/05/10 21:34:46 tron Exp $
  
  fi
  
-@@ -7632,7 +7626,7 @@
+@@ -7583,7 +7577,7 @@
  ac_given_srcdir=$srcdir
  ac_given_INSTALL="$INSTALL"
  
@@ -54,7 +61,7 @@ $NetBSD: patch-aj,v 1.6 1999/05/10 21:34:46 tron Exp $
  EOF
  cat >> $CONFIG_STATUS <<EOF
  
-@@ -7740,7 +7734,7 @@
+@@ -7691,7 +7685,7 @@
  
  cat >> $CONFIG_STATUS <<EOF
  
-- 
cgit v1.2.3