Merged revisions 7112-7130 from the official release branch

[[Imported from SVN: r7131]]

bin/duneproject

@@ -318,7 +318,7 @@ AC_PREREQ(2.50)
 DUNE_AC_INIT # gets module version from dune.module file
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([src/$CMODULE.cc])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
 
 
 # we need no more than the standard DE-stuff

configure.ac

@@ -5,7 +5,7 @@
 DUNE_AC_INIT # gets module version from dune.module file
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([dune/common/stdstreams.cc])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
 
 # add configure flags needed to create log files for dune-autobuild
 DUNE_AUTOBUILD_FLAGS