From: Guido Kanschat Date: Wed, 29 Mar 2006 09:19:38 +0000 (+0000) Subject: use -rpath AND -L to find libraries X-Git-Tag: v8.0.0~11962 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdfc44597f57dae58476da115ffae706c2a7e5b3;p=dealii.git use -rpath AND -L to find libraries git-svn-id: https://svn.dealii.org/trunk@12753 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index be9a78ee4c..72efcd0543 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -1444,7 +1444,7 @@ AC_DEFUN(DEAL_II_CHECK_RPATH, LD_PATH_OPTION="-Wl,-rpath "], [ AC_MSG_RESULT(no) LDFLAGS=$OLD_LDFLAGS - LD_PATH_OPTION="-L"]) + LD_PATH_OPTION="no"]) ]) @@ -5067,7 +5067,10 @@ dnl -------------------------------------------------- AC_DEFUN(DEAL_II_WITH_UMFPACK, dnl [ if test "x$1" != "xyes" ; then - LDFLAGS="$LD_PATH_OPTION$1/UMFPACK/Lib $LD_PATH_OPTION$1/AMD/Lib $LDFLAGS" + LDFLAGS="-L$1/UMFPACK/Lib -L$1/AMD/Lib $LDFLAGS" + if test "$LD_PATH_OPTION" != "no"; then + LDFLAGS = "$LD_PATH_OPTION$1/UMFPACK/Lib $LD_PATH_OPTION$1/AMD/Lib $LDFLAGS" + fi AC_CHECK_LIB(amd, amd_info) AC_CHECK_LIB(umfpack, umfpack_di_defaults) AC_CHECK_FILE($1/UMFPACK/Include/umfpack.h, diff --git a/deal.II/configure b/deal.II/configure index a64ea4b831..0a18e84c1a 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -4204,7 +4204,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 LDFLAGS=$OLD_LDFLAGS - LD_PATH_OPTION="-L" + LD_PATH_OPTION="no" fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -11206,7 +11206,10 @@ if test "${with_umfpack+set}" = set; then withval="$with_umfpack" if test "x$withval" != "xyes" ; then - LDFLAGS="$LD_PATH_OPTION$withval/UMFPACK/Lib $LD_PATH_OPTION$withval/AMD/Lib $LDFLAGS" + LDFLAGS="-L$withval/UMFPACK/Lib -L$withval/AMD/Lib $LDFLAGS" + if test "$LD_PATH_OPTION" != "no"; then + LDFLAGS = "$LD_PATH_OPTION$withval/UMFPACK/Lib $LD_PATH_OPTION$withval/AMD/Lib $LDFLAGS" + fi echo "$as_me:$LINENO: checking for amd_info in -lamd" >&5 echo $ECHO_N "checking for amd_info in -lamd... $ECHO_C" >&6