From c7b4ed77fb438f5c5acd6098afc9f565327acd4d Mon Sep 17 00:00:00 2001
From: Jeremy White <jwhite@codeweavers.com>
Date: Sat, 14 Jul 2001 00:49:50 +0000
Subject: [PATCH] Remove the -rpath option from the link command.

---
 configure    | 4 ++--
 configure.in | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index cfdb315e4fe..22df1d5e6f1 100755
--- a/configure
+++ b/configure
@@ -5105,7 +5105,7 @@ fi
 echo "$ac_t""$ac_cv_c_dll_gnuelf" 1>&6
   if test "$ac_cv_c_dll_gnuelf" = "yes"
   then
-    LDSHARED="\$(CC) -shared \$(SONAME:%=-Wl,-soname,%) -Wl,-rpath,\$(libdir)"
+    LDSHARED="\$(CC) -shared \$(SONAME:%=-Wl,-soname,%)"
     LDDLLFLAGS="-Wl,-Bsymbolic"
   else
     echo $ac_n "checking whether we can build a UnixWare (Solaris) dll""... $ac_c" 1>&6
@@ -5140,7 +5140,7 @@ fi
 echo "$ac_t""$ac_cv_c_dll_unixware" 1>&6
     if test "$ac_cv_c_dll_unixware" = "yes"
     then
-      LDSHARED="\$(CC) -Wl,-G \$(SONAME:%=-Wl,-h,\$(libdir)/%)"
+      LDSHARED="\$(CC) -Wl,-G \$(SONAME:%=-Wl,-h,%)"
       LDDLLFLAGS="-Wl,-B,symbolic"
     fi
   fi
diff --git a/configure.in b/configure.in
index 21be710cc87..739eaf58316 100644
--- a/configure.in
+++ b/configure.in
@@ -650,7 +650,7 @@ then
   ])
   if test "$ac_cv_c_dll_gnuelf" = "yes"
   then
-    LDSHARED="\$(CC) -shared \$(SONAME:%=-Wl,-soname,%) -Wl,-rpath,\$(libdir)"
+    LDSHARED="\$(CC) -shared \$(SONAME:%=-Wl,-soname,%)"
     LDDLLFLAGS="-Wl,-Bsymbolic"
   else
     AC_CACHE_CHECK(whether we can build a UnixWare (Solaris) dll,
@@ -662,7 +662,7 @@ then
     ])
     if test "$ac_cv_c_dll_unixware" = "yes"
     then
-      LDSHARED="\$(CC) -Wl,-G \$(SONAME:%=-Wl,-h,\$(libdir)/%)"
+      LDSHARED="\$(CC) -Wl,-G \$(SONAME:%=-Wl,-h,%)"
       LDDLLFLAGS="-Wl,-B,symbolic"
     fi
   fi