]> https://gitweb.dealii.org/ - dealii.git/commitdiff
use -rpath AND -L to find libraries
authorGuido Kanschat <dr.guido.kanschat@gmail.com>
Wed, 29 Mar 2006 09:19:38 +0000 (09:19 +0000)
committerGuido Kanschat <dr.guido.kanschat@gmail.com>
Wed, 29 Mar 2006 09:19:38 +0000 (09:19 +0000)
git-svn-id: https://svn.dealii.org/trunk@12753 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/aclocal.m4
deal.II/configure

index be9a78ee4c46fb28fe99a45fc84720baa4b0b0a1..72efcd05435bb45efc59d64d4dcfe5e440645331 100644 (file)
@@ -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,
index a64ea4b831e116643a5468fe8a7aae58a1fdaf50..0a18e84c1a6e136b59ea08e973ffb6f128498b17 100755 (executable)
@@ -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

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.