Function check for PETSc dev - looks like version checks

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

diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4
index 48d654d5cd9c1acef2ec35e0e8fe8f7747c944e6..c97293d9fb1c4132662a6a6ea811253aa6d24f57 100644 (file)
--- a/deal.II/aclocal.m4
+++ b/deal.II/aclocal.m4
@@ -5784,8 +5784,8 @@ AC_DEFUN(DEAL_II_CONFIGURE_PETSC_VERSION, dnl
                      | perl -pi -e 's/.*RELEASE\s+//g;'`
   if test "$PETSC_RELEASE" = "0" ; then
     PETSC_VERSION+="-dev"
-  else
-    PETSC_VERSION+=""
+    AC_DEFINE([DEAL_II_USE_PETSC_VERSION_DEV], [1],
+              [Defined if a PETSc installation was found and is not a release])
   fi
 
   AC_MSG_RESULT($PETSC_VERSION)

diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in
index 285d816de093704d23084baa33aba6626e9d7c73..c552fab6492417e675f5502e138258e1a522b146 100644 (file)
--- a/deal.II/common/Make.global_options.in
+++ b/deal.II/common/Make.global_options.in
@@ -57,7 +57,8 @@ DEAL_II_PETSC_ARCH   = @DEAL_II_PETSC_ARCH@
 DEAL_II_PETSC_VERSION_MAJOR    = @DEAL_II_PETSC_VERSION_MAJOR@
 DEAL_II_PETSC_VERSION_MINOR    = @DEAL_II_PETSC_VERSION_MINOR@
 DEAL_II_PETSC_VERSION_SUBMINOR = @DEAL_II_PETSC_VERSION_SUBMINOR@
-DEAL_II_PETSC_MPIUNI_LIB = @DEAL_II_PETSC_MPIUNI_LIB@
+DEAL_II_PETSC_VERSION_DEV      = @DEAL_II_PETSC_VERSION_DEV@
+DEAL_II_PETSC_MPIUNI_LIB       = @DEAL_II_PETSC_MPIUNI_LIB@
 
 USE_CONTRIB_SLEPC    = @USE_CONTRIB_SLEPC@
 DEAL_II_SLEPC_DIR    = @DEAL_II_SLEPC_DIR@

diff --git a/deal.II/configure.in b/deal.II/configure.in
index cd1ca524b411d22ac48ce35fc08a4016068a5943..0d51da38ccb25fd7b293a8a5a6c3ada2c3a5aa64 100644 (file)
--- a/deal.II/configure.in
+++ b/deal.II/configure.in
@@ -463,7 +463,7 @@ AC_SUBST(DEAL_II_PETSC_ARCH)
 AC_SUBST(DEAL_II_PETSC_VERSION_MAJOR)
 AC_SUBST(DEAL_II_PETSC_VERSION_MINOR)
 AC_SUBST(DEAL_II_PETSC_VERSION_SUBMINOR)
-AC_SUBST(USE_PETSC_DEV)
+AC_SUBST(DEAL_II_USE_PETSC_VERSION_DEV)
 AC_SUBST(DEAL_II_PETSC_MPIUNI_LIB)
 AC_SUBST(DEAL_II_DEFINE_DEAL_II_USE_PETSC)
 
@@ -851,7 +851,7 @@ AH_BOTTOM(
     (major)*10000 + (minor)*100 + (subminor))
 
 #define DEAL_II_PETSC_VERSION_DEV() \
-  (DEAL_II_USE_PETSC_DEV)
+  (DEAL_II_USE_PETSC_VERSION_DEV)
 
 #include <deal.II/base/numbers.h>
 #include <deal.II/base/types.h>

diff --git a/deal.II/include/deal.II/base/config.h.in b/deal.II/include/deal.II/base/config.h.in
index 72a9cda704eace1206480e63dae371a0e354368e..ec612a1c5f048629370f3881f23febbe90d6112a 100644 (file)
--- a/deal.II/include/deal.II/base/config.h.in
+++ b/deal.II/include/deal.II/base/config.h.in
@@ -266,7 +266,7 @@
 #undef DEAL_II_USE_PETSC_COMPLEX
 
 /* Defined if a PETSc installation was found and is not a release */
-#undef DEAL_II_USE_PETSC_DEV
+#undef DEAL_II_USE_PETSC_VERSION_DEV
 
 /* Defined if a SLEPc installation was found and is going to be used */
 #undef DEAL_II_USE_SLEPC
@@ -651,7 +651,7 @@
     (major)*10000 + (minor)*100 + (subminor))
 
 #define DEAL_II_PETSC_VERSION_DEV() \
-  (DEAL_II_USE_PETSC_DEV)
+  (DEAL_II_USE_PETSC_VERSION_DEV)
 
 #include <deal.II/base/numbers.h>
 #include <deal.II/base/types.h>