From a2c37bfc01d85487bc99cb3f2618e2111e6f14ce Mon Sep 17 00:00:00 2001 From: wolf Date: Thu, 26 May 2005 17:44:17 +0000 Subject: [PATCH] Fix previous version of adding blas when using petsc with static libs. git-svn-id: https://svn.dealii.org/trunk@10766 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 6 +++--- deal.II/configure | 15 ++++++++------- deal.II/configure.in | 9 +++++---- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 369d617ffb..c8ca5ee8e2 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -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 ]) diff --git a/deal.II/configure b/deal.II/configure index 5e6d4af652..018055c69f 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -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" diff --git a/deal.II/configure.in b/deal.II/configure.in index c3849bd5da..2da9ca7b46 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -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. -- 2.39.5