merge of 4858 4860 and 4861 was incomplete

[[Imported from SVN: r4864]]

Makefile.am

@@ -14,6 +14,6 @@ pkgconfig_DATA = dune-common.pc
 
 # use configured compiler for "make distcheck"
 # doxygen is difficult to convince to build in a special directory...
-DISTCHECK_CONFIGURE_FLAGS = CXX="$(CXX)" CC="$(CC)" DOXYGEN="true"
+DISTCHECK_CONFIGURE_FLAGS = CXX="$(CXX)" CC="$(CC)" DOXYGEN="true" --enable-parallel=@ENABLE_PARALLEL@ MPICC="$(MPICC)"
 
 include $(top_srcdir)/am/global-rules

doc/doxygen/Makefile.am

@@ -33,7 +33,7 @@ endif
 
 
 #we need this in the distribution
-EXTRA_DIST = $(WHAT) $(DOXYGEN_DIST) $(DOXYGENHEADER)
+EXTRA_DIST = $(WHAT) $(DOXYGEN_DIST) $(DOXYGENHEADER) doxy-footer.html $(PAGES)
 
 doxygendir = $(datadir)/doc/dune-common/doxygen
 doxygen_DATA = $(WHAT)
@@ -73,7 +73,7 @@ doxygen-tag: FORCE $(DOXYGENHEADERBUILD)
 html: doxygen-tag
 
 html-dist: $(DOXYGENHEADERBUILD)
-	rm -rf html; \
+	rm -rf html
 	set -e; \
 	if test -e Doxyfile; then \
 	  ( cat Doxyfile; $(DOXYFILESHORT_OVERWRITE) ) > Doxyfile.tmp; \

m4/dune.m4

@@ -151,7 +151,7 @@ AC_DEFUN([DUNE_CHECK_MODULES],[
       HAVE_[]_DUNE_MODULE=0
 
       # define LTCXXCOMPILE like it will be defined in the Makefile
-      LTCXXLINK="$srcdir/libtool --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS"
+      LTCXXLINK="./libtool --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS"
       CXX="$LTCXXLINK"
 
       # use module LDFLAGS

m4/dune_mpi.m4

@@ -73,6 +73,7 @@ AC_DEFUN([DUNE_MPI],[
     [with_parallel=$enableval],
     [with_parallel=yes]
   )
+  AC_SUBST(ENABLE_PARALLEL, "$with_parallel")
 
   # disable runtest if we have a queuing system
   AC_ARG_ENABLE(mpiruntest,