]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Fix previous version of adding blas when using petsc with static libs.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 26 May 2005 17:44:17 +0000 (17:44 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 26 May 2005 17:44:17 +0000 (17:44 +0000)
git-svn-id: https://svn.dealii.org/trunk@10766 0785d39b-7218-0410-832d-ea1e28bc413d

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

index 369d617ffbe8c3ba743007b240511e00fcb7dbbf..c8ca5ee8e20919cc057a76be479b777f2dff5db8 100644 (file)
@@ -4414,9 +4414,9 @@ AC_DEFUN(DEAL_II_CONFIGURE_PETSC, dnl
     DEAL_II_CONFIGURE_PETSC_ARCH
     DEAL_II_CONFIGURE_PETSC_VERSION
 
-    dnl Finally set with-petsc if this hasn't happened yet
-    if test "x$with-petsc" = "x" ; then
-      with-petsc="yes"
+    dnl Finally set with_petsc if this hasn't happened yet
+    if test "x$with_petsc" = "x" ; then
+      with_petsc="yes"
     fi
   fi
 ])
index 5e6d4af6526dac7c1a30fe3df3cafed77d34b133..018055c69f368781e0a0931bba8e4b446104d2fb 100755 (executable)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.201 .
+# From configure.in Revision: 1.202 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.54.
 #
@@ -8022,8 +8022,8 @@ echo $ECHO_N "checking for PETSc version... $ECHO_C" >&6
 echo "${ECHO_T}$PETSC_VERSION" >&6
 
 
-        if test "x$with-petsc" = "x" ; then
-      with-petsc="yes"
+        if test "x$with_petsc" = "x" ; then
+      with_petsc="yes"
     fi
   fi
 
@@ -8051,16 +8051,17 @@ if test "x$with_lapack" != "x" ; then
 fi
 
 
-if test "x$with-petsc" != "x" ; then
-  if "x$enableshared" != "no" ; then
-   abort
+echo $with_petsc
+echo $enableshared
+
+if test "x$with_petsc" != "x" ; then
+  if test "x$enableshared" = "xno" ; then
     with_blas="yes"
   fi
 fi
 
 
 
-
 # Check whether --with-blas or --without-blas was given.
 if test "${with_blas+set}" = set; then
   withval="$with_blas"
index c3849bd5da130321d5e977574bb784e1ca1456f5..2da9ca7b4641511dcd4121768b76ae2861420346 100644 (file)
@@ -392,14 +392,15 @@ fi
 dnl Likewise, if we use PETSc and link statically, we have to add blas to the
 dnl linker line (if we use shared libs, then the PETSc libs already carry this
 dnl dependence, but static archives do not have a method to list dependencies)
-if test "x$with-petsc" != "x" ; then
-  if "x$enableshared" != "no" ; then
-   abort
+echo $with_petsc
+echo $enableshared
+
+if test "x$with_petsc" != "x" ; then
+  if test "x$enableshared" = "xno" ; then
     with_blas="yes"
   fi
 fi
 
-
 dnl -------------------------------------------------------------
 dnl Actually include libraries here. Check for the libraries
 dnl    requiring FORTRAN support first.

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.