d25867b
--- configure.orig	2007-08-18 09:42:40.000000000 +0200
d25867b
+++ configure	2007-08-18 09:44:10.000000000 +0200
d25867b
@@ -8525,14 +8525,14 @@
46f31ca
 fi
46f31ca
 
46f31ca
 
46f31ca
-      as_ac_var=`echo "ac_cv_cflags_-fPIC -Wl,--rpath,\$ORIGIN/../lib" | $as_tr_sh`
46f31ca
-{ echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib" >&5
46f31ca
-echo $ECHO_N "checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib... $ECHO_C" >&6; }
46f31ca
+      as_ac_var=`echo "ac_cv_cflags_-fPIC" | $as_tr_sh`
46f31ca
+{ echo "$as_me:$LINENO: checking whether the compiler supports -fPIC" >&5
8009fb6
+echo $ECHO_N "checking whether the compiler supports -fPIC $ECHO_C" >&6; }
46f31ca
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
d229248
   echo $ECHO_N "(cached) $ECHO_C" >&6
d229248
 else
d229248
   ac_wine_try_cflags_saved=$CFLAGS
d229248
-CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib"
d229248
+CFLAGS="$CFLAGS -fPIC"
d229248
 cat >conftest.$ac_ext <<_ACEOF
d229248
 /* confdefs.h.  */
d229248
 _ACEOF
d25867b
@@ -8582,8 +8582,8 @@
46f31ca
 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
46f31ca
 echo "${ECHO_T}$ac_res" >&6; }
46f31ca
 if test `eval echo '${'$as_ac_var'}'` = yes; then
d1fcaa2
-  LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
d1fcaa2
-                       LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"
d1fcaa2
+  LDRPATH_INSTALL=""
d25867b
+  LDRPATH_LOCAL=""
8009fb6
 else
d25867b
   as_ac_var=`echo "ac_cv_cflags_-fPIC -Wl,-R,\$ORIGIN/../lib" | $as_tr_sh`
d25867b
 { echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5
d25867b
--- configure.ac.orig	2007-08-18 09:44:15.000000000 +0200
d25867b
+++ configure.ac	2007-08-18 09:44:46.000000000 +0200
d25867b
@@ -439,13 +439,6 @@
46f31ca
       WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic],
46f31ca
                       [AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"])])
d229248
 
46f31ca
-      WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],
d1fcaa2
-                      [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
d1fcaa2
-                       LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"],
8009fb6
-          [WINE_TRY_CFLAGS([-fPIC -Wl,-R,\$ORIGIN/../lib],
d1fcaa2
-                           [LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
d1fcaa2
-                            LDRPATH_LOCAL="-Wl,-R,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"])])
d229248
-
d25867b
       WINE_TRY_CFLAGS([-Wl,--enable-new-dtags],
d25867b
                       [LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,--enable-new-dtags"])
d25867b