Fix some more forgotten instances of MPI_CPPFLAGS

[[Imported from SVN: r5818]]

am/headercheck

@@ -10,7 +10,7 @@ headercheck_PATTERN = *.hh
 hctest.o: hctest.cc
 	$(CXX) -I$(top_srcdir) -DHEADERCHECK \
 	  $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \
-	  $(MPI_CPPFLAGS) $(ALL_PKG_CPPFLAGS) -c -o $@ $<
+	  $(DUNEMPICPPFLAGS) $(ALL_PKG_CPPFLAGS) -c -o $@ $<
 
 headercheck:
 	@if test x"$$HEADER" = "x"; then \

m4/parmetis.m4

@@ -66,7 +66,7 @@ AC_DEFUN([DUNE_PATH_PARMETIS],[
       PARMETIS_LDFLAGS="$DUNEMPILDFLAGS"
 
       # set variables so that tests can use them
-      CPPFLAGS="$CPPFLAGS -I$PARMETIS_INCLUDE_PATH $MPI_CPPFLAGS"
+      CPPFLAGS="$CPPFLAGS -I$PARMETIS_INCLUDE_PATH $DUNEMPICPPFLAGS"
 
       # check for central header
       AC_CHECK_HEADER([parmetis.h],[
@@ -76,7 +76,7 @@ AC_DEFUN([DUNE_PATH_PARMETIS],[
 	      AC_MSG_WARN([parmetis.h not found in $PARMETIS_INCLUDE_PATH with $CPPFLAGS])]
       )
 
-      PARMETIS_CPPFLAGS="${MPI_CPPFLAGS} ${PARMETIS_CPPFLAGS} -DENABLE_PARMETIS=1"
+      PARMETIS_CPPFLAGS="${DUNEMPICPPFLAGS} ${PARMETIS_CPPFLAGS} -DENABLE_PARMETIS=1"
 
 #      AC_LANG_PUSH([C++])