From 2cb68a349530840020ad9ae0302a3db8efe938a9 Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Wed, 30 Aug 2017 15:45:12 +0200 Subject: [PATCH] deal with run-time-path for macOS. --- configure.ac | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index f1ca7f2f..613ba1c5 100644 --- a/configure.ac +++ b/configure.ac @@ -973,15 +973,15 @@ dnl LDFLAGS="$OPENCL_LDFLAGS $LDFLAGS" dnl check for DKS dnl ------------------------------------------- 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="/usr/local/DKS/build"]) + [dks_prefix="/usr/local/DKS"]) dnl Setting the prefix to the default if only --with-dks was given AC_MSG_CHECKING([whether DKS is installed in a standard location]) if test "$dks_prefix" == "yes"; then if test "$withval" == "yes"; then - dks_prefix="/usr/local/DKS/build" + dks_prefix="/usr/local/DKS" fi fi @@ -1304,6 +1304,9 @@ case "$host" in *-*-darwin*) ARCH=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