]> https://gitweb.dealii.org/ - dealii.git/commitdiff
prepare umfpack for -rpath
authorGuido Kanschat <dr.guido.kanschat@gmail.com>
Tue, 28 Mar 2006 06:07:38 +0000 (06:07 +0000)
committerGuido Kanschat <dr.guido.kanschat@gmail.com>
Tue, 28 Mar 2006 06:07:38 +0000 (06:07 +0000)
git-svn-id: https://svn.dealii.org/trunk@12706 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/aclocal.m4

index b88edc88a343a94a5f117c7a50bc824c0f5f7d28..be9a78ee4c46fb28fe99a45fc84720baa4b0b0a1 100644 (file)
@@ -3759,6 +3759,8 @@ AC_DEFUN(DEAL_II_CHECK_BOOST, dnl
   DEAL_II_WITH_BOOST($withval))
 
   CPPFLAGS="$BOOST_INCLUDE_DIR $CPPFLAGS"
+  LDFLAGS="$BOOST_LIB_DIR $LDFLAGS"
+
   AC_CHECK_HEADER(boost/shared_ptr.hpp,,
     [AC_MSG_ERROR([Your boost installation is incomplete!])])
   AC_CHECK_HEADER(boost/type_traits.hpp,,
@@ -5065,7 +5067,7 @@ dnl --------------------------------------------------
 AC_DEFUN(DEAL_II_WITH_UMFPACK, dnl
 [
   if test "x$1" != "xyes" ; then
-    LDFLAGS="-L$1/UMFPACK/Lib -L$1/AMD/Lib $LDFLAGS"
+    LDFLAGS="$LD_PATH_OPTION$1/UMFPACK/Lib $LD_PATH_OPTION$1/AMD/Lib $LDFLAGS"
     AC_CHECK_LIB(amd, amd_info)
     AC_CHECK_LIB(umfpack, umfpack_di_defaults)
     AC_CHECK_FILE($1/UMFPACK/Include/umfpack.h,
@@ -5126,8 +5128,10 @@ AC_DEFUN(DEAL_II_WITH_BOOST, dnl
 [
   if test "x$1" != "xyes" ; then
     BOOST_INCLUDE_DIR="-I$1"
+    BOOST_LIB_DIR="$LD_PATH_OPTION$1/lib"
   else
     BOOST_INCLUDE_DIR=''
+    BOOST_LIB_DIR=''
   fi
 ])
 

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.