Merge branch 'master' of http://git.dune-project.org/repositories/dune-common

dune/common/version.hh

@@ -12,6 +12,7 @@
  * For the DUNE core modules you need to use the following module names:
  *  - DUNE_COMMON for dune-common
  *  - DUNE_GRID for dune-grid
+ *  - DUNE_GEOMETRY for dune-geometry
  *  - DUNE_ISTL for dune-istl
  *  - DUNE_LOCALFUNCTIONS for dune-localfunctions
  *
@@ -30,6 +31,7 @@
  * For the DUNE core modules you need to use the following module names:
  *  - DUNE_COMMON for dune-common
  *  - DUNE_GRID for dune-grid
+ *  - DUNE_GEOMETRY for dune-geometry
  *  - DUNE_ISTL for dune-istl
  *  - DUNE_LOCALFUNCTIONS for dune-localfunctions
  *
@@ -47,6 +49,7 @@
  * For the DUNE core modules you need to use the following module names:
  *  - DUNE_COMMON for dune-common
  *  - DUNE_GRID for dune-grid
+ *  - DUNE_GEOMETRY for dune-geometry
  *  - DUNE_ISTL for dune-istl
  *  - DUNE_LOCALFUNCTIONS for dune-localfunctions
  *
@@ -64,6 +67,7 @@
  * For the DUNE core modules you need to use the following module names:
  *  - DUNE_COMMON for dune-common
  *  - DUNE_GRID for dune-grid
+ *  - DUNE_GEOMETRY for dune-geometry
  *  - DUNE_ISTL for dune-istl
  *  - DUNE_LOCALFUNCTIONS for dune-localfunctions
  *
@@ -81,6 +85,7 @@
  * For the DUNE core modules you need to use the following module names:
  *  - DUNE_COMMON for dune-common
  *  - DUNE_GRID for dune-grid
+ *  - DUNE_GEOMETRY for dune-geometry
  *  - DUNE_ISTL for dune-istl
  *  - DUNE_LOCALFUNCTIONS for dune-localfunctions
  *
@@ -100,6 +105,7 @@
  * For the DUNE core modules you need to use the following module names:
  *  - DUNE_COMMON for dune-common
  *  - DUNE_GRID for dune-grid
+ *  - DUNE_GEOMETRY for dune-geometry
  *  - DUNE_ISTL for dune-istl
  *  - DUNE_LOCALFUNCTIONS for dune-localfunctions
  *
@@ -116,6 +122,7 @@
  * For the DUNE core modules you need to use the following module names:
  *  - DUNE_COMMON for dune-common
  *  - DUNE_GRID for dune-grid
+ *  - DUNE_GEOMETRY for dune-geometry
  *  - DUNE_ISTL for dune-istl
  *  - DUNE_LOCALFUNCTIONS for dune-localfunctions
  *

m4/dune_mpi.m4

@@ -135,7 +135,7 @@ AC_DEFUN([DUNE_MPI],[
     ac_save_LIBS="$LIBS"
     ac_save_LDFLAGS="$LDFLAGS"
     ac_save_CPPFLAGS="$CPPFLAGS"
-    
+
     # looks weird but as the -l... are contained in the MPI_LDFLAGS these
     # parameters have to be last on the commandline: with LIBS this is true
     LIBS="$DUNEMPILIBS $LIBS"
@@ -147,8 +147,8 @@ AC_DEFUN([DUNE_MPI],[
     AC_COMPILE_IFELSE(
       [AC_LANG_SOURCE(
         [ #include <mpi.h>
-          int main (int argc, char** argv) { 
-          MPI_Init(&argc, &argv); 
+          int main (int argc, char** argv) {
+          MPI_Init(&argc, &argv);
           MPI_Finalize(); }])],
         [ AC_MSG_RESULT([yes]) ],
         [ AC_MSG_RESULT([no])
@@ -158,14 +158,14 @@ AC_DEFUN([DUNE_MPI],[
     )
 
     AS_IF([test "x$mpiruntest" != "xyes"],[
-      AC_MSG_WARN([Disabled test whether running with $dune_MPI_VERSION works.])    
+      AC_MSG_WARN([Disabled test whether running with $dune_MPI_VERSION works.])
     ],[
       AC_MSG_CHECKING([whether running with $dune_MPI_VERSION works])
       AC_RUN_IFELSE(
         [AC_LANG_SOURCE(
           [ #include <mpi.h>
-            int main (int argc, char** argv) { 
-            MPI_Init(&argc, &argv); 
+            int main (int argc, char** argv) {
+            MPI_Init(&argc, &argv);
             MPI_Finalize(); }])],
           [ AC_MSG_RESULT([yes]) ],
           [ AC_MSG_RESULT([no])
@@ -185,14 +185,14 @@ AC_DEFUN([DUNE_MPI],[
 
     # Check for MPI-2 Standard
     # We have to provide a dummy lib here as we do not know what the name
-    # of the mpi is. -lm should be save.
-    AC_CHECK_LIB(m,[MPI_Finalized], [AC_DEFINE(MPI_2, 1, [Define to 1 MPI supports MPI-2])])
+    # of the mpi is. -lm should be saved.
+    AC_CHECK_LIB(m,[MPI_Finalized], [AC_DEFINE(MPI_2, 1, [Define to 1 if MPI supports MPI-2])])
 
     # restore variables
     LIBS="$ac_save_LIBS"
     CPPFLAGS="$ac_save_CPPFLAGS"
   ])
-    
+
   # set flags
   AS_IF([test "x$with_mpi" != "xno"],[
     AC_DEFINE(HAVE_MPI,ENABLE_MPI,[Define if you have the MPI library.