deal with run-time-path for macOS.

This commit is contained in:
suter_a 2017-08-30 15:45:12 +02:00
parent 8f86af959c
commit 2cb68a3495

View File

@ -973,15 +973,15 @@ dnl LDFLAGS="$OPENCL_LDFLAGS $LDFLAGS"
dnl check for DKS dnl check for DKS
dnl ------------------------------------------- dnl -------------------------------------------
AC_ARG_WITH([dks], AC_ARG_WITH([dks],
[AS_HELP_STRING([--with-dks],[prefix of the DKS installation, e.g. /usr/local/DKS/build])], [AS_HELP_STRING([--with-dks],[prefix of the DKS installation, e.g. /usr/local/DKS])],
[dks_prefix=$withval], [dks_prefix=$withval],
[dks_prefix="/usr/local/DKS/build"]) [dks_prefix="/usr/local/DKS"])
dnl Setting the prefix to the default if only --with-dks was given dnl Setting the prefix to the default if only --with-dks was given
AC_MSG_CHECKING([whether DKS is installed in a standard location]) AC_MSG_CHECKING([whether DKS is installed in a standard location])
if test "$dks_prefix" == "yes"; then if test "$dks_prefix" == "yes"; then
if test "$withval" == "yes"; then if test "$withval" == "yes"; then
dks_prefix="/usr/local/DKS/build" dks_prefix="/usr/local/DKS"
fi fi
fi fi
@ -1304,6 +1304,9 @@ case "$host" in
*-*-darwin*) *-*-darwin*)
ARCH=DARWIN ARCH=DARWIN
LOCAL_PSIBIN_LIB_CXXFLAGS="${LOCAL_LIB_CXXFLAGS} -D_Darwin_" LOCAL_PSIBIN_LIB_CXXFLAGS="${LOCAL_LIB_CXXFLAGS} -D_Darwin_"
if test "${DKS_ENABLED}" = "1"; then
LOCAL_BIN_LDFLAGS="${LOCAL_BIN_LDFLAGS} -Wl,-rpath ${ROOTLIBDIR} -Wl,-rpath ${DKS_LIBDIR}"
fi
;; ;;
*) *)
ARCH=OTHERUNIX ARCH=OTHERUNIX