63 lines
2.1 KiB
Diff
63 lines
2.1 KiB
Diff
diff --git a/configure b/configure
|
|
index 774a95ce003..d408e77cc78 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -11137,6 +11137,38 @@ fi
|
|
LIBWINE_DEPENDS="wine.map"
|
|
|
|
TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.so.$libwine_version libs/wine/libwine.so.$libwine_soversion"
|
|
+
|
|
+ # do this at the end because it needs double dollar for makefile
|
|
+ as_ac_var=`printf "%s\n" "ac_cv_cflags_-Wl,-rpath,\\\\\\$ORIGIN" | $as_tr_sh`
|
|
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-rpath,\\\$ORIGIN" >&5
|
|
+printf %s "checking whether the compiler supports -Wl,-rpath,\\\$ORIGIN... " >&6; }
|
|
+if eval test \${$as_ac_var+y}
|
|
+then :
|
|
+ printf %s "(cached) " >&6
|
|
+else $as_nop
|
|
+ ac_wine_try_cflags_saved=$CFLAGS
|
|
+CFLAGS="$CFLAGS -Wl,-rpath,\\\$ORIGIN"
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+int main(int argc, char **argv) { return 0; }
|
|
+_ACEOF
|
|
+if ac_fn_c_try_link "$LINENO"
|
|
+then :
|
|
+ eval "$as_ac_var=yes"
|
|
+else $as_nop
|
|
+ eval "$as_ac_var=no"
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+CFLAGS=$ac_wine_try_cflags_saved
|
|
+fi
|
|
+eval ac_res=\$$as_ac_var
|
|
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
|
+printf "%s\n" "$ac_res" >&6; }
|
|
+if eval test \"x\$"$as_ac_var"\" = x"yes"
|
|
+then :
|
|
+ UNIXLDFLAGS="$UNIXLDFLAGS '-Wl,-rpath,\$\$ORIGIN'"
|
|
+fi
|
|
;;
|
|
esac
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 8c5066a3de6..01ede86df1e 100644
|
|
<<<<<<< HEAD
|
|
--- a/wine-7.6/configure.ac
|
|
+++ b/wine-7.6/configure.ac
|
|
=======
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
>>>>>>> 6dccb4ef9c (wine: patch into $build_wrksrc)
|
|
@@ -916,6 +916,9 @@ case $host_os in
|
|
AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version")
|
|
AC_SUBST(LIBWINE_DEPENDS,"wine.map")
|
|
TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.so.$libwine_version libs/wine/libwine.so.$libwine_soversion"
|
|
+
|
|
+ # do this at the end because it needs double dollar for makefile
|
|
+ WINE_TRY_CFLAGS([-Wl,-rpath,\\\$ORIGIN],[UNIXLDFLAGS="$UNIXLDFLAGS '-Wl,-rpath,\$\$ORIGIN'"])
|
|
;;
|
|
esac
|
|
|