]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Use DEAL_II_TRILINOS_LIBDIR instead of DEAL_II_TRILINOS_DIR/lib since the latter...
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Tue, 21 Oct 2008 13:49:46 +0000 (13:49 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Tue, 21 Oct 2008 13:49:46 +0000 (13:49 +0000)
git-svn-id: https://svn.dealii.org/trunk@17290 0785d39b-7218-0410-832d-ea1e28bc413d

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

index 4cbbffb24e98db7be3614160fe32ffa566f2099e..00ed3ab2b6be19dae51e67c370b48463f4b50edc 100644 (file)
@@ -5674,9 +5674,9 @@ AC_DEFUN(DEAL_II_CHECK_TRILINOS_SHARED_STATIC, dnl
   dnl If we use shared libs (and we've made sure above that Trilinos provides
   dnl these as well), then set some of the LD_FLAGS and similar
   if test "x$enableshared" = "xyes" ; then
-    LDFLAGS="$LDFLAGS -L$DEAL_II_TRILINOS_DIR/lib"
+    LDFLAGS="$LDFLAGS -L$DEAL_II_TRILINOS_LIBDIR"
     if test "x$LD_PATH_OPTION" != "xno" ; then
-      LDFLAGS="$LDFLAGS $LD_PATH_OPTION$DEAL_II_TRILINOS_DIR/lib"
+      LDFLAGS="$LDFLAGS $LD_PATH_OPTION$DEAL_II_TRILINOS_LIBDIR"
     fi
   fi
 ])
index 28f5beda32331ba0193e760e748c9a92bae3f973..f67cd0bbc92d05bf98bd56376158373419d4832d 100755 (executable)
@@ -12362,9 +12362,9 @@ echo "$as_me: error: When building deal.II with shared libraries, Trilinos also
   fi
 
       if test "x$enableshared" = "xyes" ; then
-    LDFLAGS="$LDFLAGS -L$DEAL_II_TRILINOS_DIR/lib"
+    LDFLAGS="$LDFLAGS -L$DEAL_II_TRILINOS_LIBDIR"
     if test "x$LD_PATH_OPTION" != "xno" ; then
-      LDFLAGS="$LDFLAGS $LD_PATH_OPTION$DEAL_II_TRILINOS_DIR/lib"
+      LDFLAGS="$LDFLAGS $LD_PATH_OPTION$DEAL_II_TRILINOS_LIBDIR"
     fi
   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.