Synced with trunk

[[Imported from SVN: r6813]]

Makefile.am

@@ -4,8 +4,8 @@
 EXTRA_DIST=dune.module
 
 # don't follow the full GNU-standard
-# need automake >= 1.5
-AUTOMAKE_OPTIONS = foreign 1.5
+# need automake 1.9 or newer
+AUTOMAKE_OPTIONS = foreign 1.9
 
 SUBDIRS = dune lib doc bin m4 am
 

cmake/modules/DuneMacros.cmake

@@ -15,7 +15,12 @@
 #
 # dune_project()
 #
-#  macro that should be called near the begin of the top level CMakeLists.txt.
+#  macro that should be called near the beginning of the top level
+# CMakeLists.txt. Please make sure to call
+#
+# project(dune-module-name)
+#
+# at the very beginning of that file.
 # Namely it sets up the module, defines basic variables and manages
 # depedencies.
 # Don't forget to call finalize_dune_project afterwards.
@@ -127,6 +132,8 @@ macro(dune_module_information MODULE_DIR)
     string(REGEX REPLACE ".*Depends:[ ]*([^ \n]+).*" "\\1" DUNE_DEPENDS "${MODULE_LINE}")
   endif(MODULE_LINE)
 
+  string(REGEX REPLACE ".*Suggests:[ ]*([^ \n]+).*" "\\1" DUNE_SUGGESTS "${MODULE_LINE}")
+
   dune_module_to_uppercase(DUNE_MOD_NAME_UPPERCASE ${DUNE_MOD_NAME})
 
   # set module version

dune.module

 Module: dune-common
 Version: 2.3-svn
-Maintainer: dune@dune-project.org
+Maintainer: dune-devel@dune-project.org

dune/common/shared_ptr.hh

@@ -386,9 +386,9 @@ namespace Dune
      @relates shared_ptr
 
      If you allocate an object on the stack, but want to pass it to a class or function as a shared_ptr,
-     you can use this deleter to avoid accidential deletion of the stack-allocated object.
+     you can use this deleter to avoid accidental deletion of the stack-allocated object.
 
-     For convinience we provide two free functions to create a shared_ptr from a stack-allocated object
+     For convenience we provide two free functions to create a shared_ptr from a stack-allocated object
      (\see stackobject_to_shared_ptr):
 
      1) Convert a stack-allocated object to a shared_ptr: