partly merge trunk

[[Imported from SVN: r6761]]

COPYING

@@ -12,6 +12,7 @@ Copyright holders:
 2005--2010    Carsten Gräser
 2010--2012    Christoph Grüninger
 2006          Bernhard Haasdonk
+2012          Olaf Ippisch
 2009          Leonard Kern
 2005--2007    Sreejith Pulloor Kuttanikkad
 2003--2012    Robert Klöfkorn
@@ -31,6 +32,7 @@ Copyright holders:
 2006          Klaus Schneider
 2004          Roland Schulz
 2009--2011    Bård Skaflestad
+2012          Matthias Wohlmuth
 2011          Jonathan Youett
 
 

m4/cxx0x_nullptr.m4

@@ -5,6 +5,7 @@ AC_DEFUN([NULLPTR_CHECK],[
     AC_LANG_PUSH([C++])
     AC_TRY_COMPILE([],[
       char* ch = nullptr;
+      if(ch!=nullptr) { ; }
       ], 
       dune_cv_nullptr_support=yes,
       dune_cv_nullptr_support=no)

m4/parmetis.m4

@@ -80,7 +80,7 @@ AC_DEFUN([DUNE_PATH_PARMETIS],[
   if test x"$with_mpi" != x"no" && test x"$with_parmetis" != x"no" ; then
           
       # defaultpath
-      PARMETIS_LIB_PATH="$with_parmetis$lib_path"
+      PARMETIS_LIB_PATH="$with_parmetis/$lib_path"
       PARMETIS_INCLUDE_PATH="$with_parmetis/$include_path"
                   
       PARMETIS_LIBS="-L$PARMETIS_LIB_PATH -l$with_metis_lib $DUNEMPILIBS -lm"