fixed bug

git-svn-id: https://svn.dealii.org/trunk@14622 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/configure b/deal.II/configure
index 2d83d704b450d23e6e9a4edb29e60f8b4fa84f65..1a6d4d459dfde5d61533746759ffe7634be57ee5 100755 (executable)
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 14318 .
+# From configure.in Revision: 14620 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.60 for deal.II 5.3.pre.
 #
@@ -12815,20 +12815,20 @@ echo "${ECHO_T}$DEAL_II_PETSC_MPIUNI_LIB" >&6; }
 
 
 
-if test "x$with_umfpack" != "x" and "x$with_umfpack" != "xno" ; then
+if test "x$with_umfpack" != "x" -a "x$with_umfpack" != "xno" ; then
   if test "x$with_blas" = "x" ; then
     with_blas="yes"
   fi
 fi
 
-if test "x$with_lapack" != "x" and "x$with_lapack" != "xno" ; then
+if test "x$with_lapack" != "x" -a "x$with_lapack" != "xno" ; then
   if test "x$with_blas" = "x" ; then
     with_blas="yes"
   fi
 fi
 
 
-if test "x$with_petsc" != "x" and "x$with_petsc" != "xno" ; then
+if test "x$with_petsc" != "x" -a "x$with_petsc" != "xno" ; then
   if test "x$enableshared" = "xno" ; then
     if test "x$with_blas" = "x" ; then
       with_blas="yes"

diff --git a/deal.II/configure.in b/deal.II/configure.in
index a8a8df68b35a050a55f4706f3158aa2e81dbf95a..7902a16777e6d2e682ce188f5d1c1f9fd450f965 100644 (file)
--- a/deal.II/configure.in
+++ b/deal.II/configure.in
@@ -413,13 +413,13 @@ AC_SUBST(DEAL_II_DEFINE_DEAL_II_USE_PETSC)
 dnl Make sure we configure for libraries used by other libraries. For
 dnl example, UMFPACK needs blas, and so does LAPACK
 
-if test "x$with_umfpack" != "x" and "x$with_umfpack" != "xno" ; then
+if test "x$with_umfpack" != "x" -a "x$with_umfpack" != "xno" ; then
   if test "x$with_blas" = "x" ; then
     with_blas="yes"
   fi
 fi
 
-if test "x$with_lapack" != "x" and "x$with_lapack" != "xno" ; then
+if test "x$with_lapack" != "x" -a "x$with_lapack" != "xno" ; then
   if test "x$with_blas" = "x" ; then
     with_blas="yes"
   fi
@@ -429,7 +429,7 @@ 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" and "x$with_petsc" != "xno" ; then
+if test "x$with_petsc" != "x" -a "x$with_petsc" != "xno" ; then
   if test "x$enableshared" = "xno" ; then
     if test "x$with_blas" = "x" ; then
       with_blas="yes"