Compare revisions

Markus Blatt · Markus Blatt · Torbjörn Klatt · Markus Blatt · Markus Blatt · Christoph Grüninger
--- a/bin/am2cmake.py
+++ b/bin/am2cmake.py
@@ -764,7 +764,7 @@ def create_cmake_dirs_and_file(dirname, module_name):
           'set(@DUNE_MOD_NAME@_LIBRARIES "")\n',
           'set(@DUNE_MOD_NAME@_DEPENDS "@DUNE_DEPENDS@")\n',
           'set(@DUNE_MOD_NAME@_SUGGESTS "@DUNE_SUGGESTS@")\n',
-           'set(@DUNE_MOD_NAME@_MODULE_PATH "@DUNE_INSTALL_MODULEDIR@")\n',
+           'set(@DUNE_MOD_NAME@_MODULE_PATH "\${_prefix}/@DUNE_INSTALL_MODULEDIR@")\n',
           'endif(NOT @DUNE_MOD_NAME@_FOUND)\n']
    text = ''.join(lines)
    output=open(os.path.join(dirs['pkg'], module_name+'-config.cmake.in'), 'w')

--- a/bin/dune-autogen
+++ b/bin/dune-autogen
@@ -27,13 +27,13 @@ rm -f dune-all.m4
 rm -f $name.m4

 # add current dir to PATH
-PATH=`dirname $0`:$PATH
+PATH=`dirname "$0"`:$PATH

 # guess libtool prefix
 if test -n "$LIBTOOLIZE"; then
-    LIBTOOL_prefix=`dirname \`dirname $LIBTOOLIZE\``
+    LIBTOOL_prefix=`dirname "\`dirname "$LIBTOOLIZE"\`"`
    PATH=$LIBTOOL_prefix:$PATH
-    ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $LIBTOOL_prefix/share/aclocal"
+    ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I \"$LIBTOOL_prefix/share/aclocal\""
 fi

 for OPT in "$@"; do
@@ -61,7 +61,7 @@ for OPT in "$@"; do
 	-h|--help) usage ; exit 0 ;;
 	*)
            if test -d "$OPT/m4"; then
-              ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $OPT/m4"
+              ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I \"$OPT/m4\""
            fi
            if test -f "$OPT/dune-common.pc.in" ; then
 #            if test \( -d "$OPT/am" \) -a ! \( -h "$OPT/am" \) ; then
@@ -121,14 +121,14 @@ dunecontrol --only=$name m4create
 echo "--> aclocal..."
 rm -f aclocal.m4
 rm -rf autom4te.cache
-aclocal$AMVERSION -I . $ACLOCAL_FLAGS
+eval aclocal$AMVERSION "-I . $ACLOCAL_FLAGS"

 # create a link to the dune-common am directory
 if [ "$name" != "dune-common" ]; then
-  if [ -n "$am_dir" ] && [ -d $am_dir ]; then
+  if [ -n "$am_dir" ] && [ -d "$am_dir" ]; then
    echo "--> linking dune-common/am..."
    rm -f am
-    ln -s $am_dir am
+    ln -s "$am_dir" am
  else
    echo
    echo "Error: Could not find dune-common/am!"

--- a/bin/dunecontrol
+++ b/bin/dunecontrol
@@ -58,7 +58,7 @@ canonicalpath(){
     echo Usage: canonicalpath path >&2
     return 1
  fi
-  dirname `canonicalname "$1"`
+  dirname "`canonicalname "$1"`"
 }

 checkdebug () {
@@ -78,7 +78,7 @@ if test "x$DEBUG" = "xyes"; then
  set -v
 fi

-export PREFIX_DIR="`canonicalpath $0`/.."
+export PREFIX_DIR="`canonicalpath "$0"`/.."

 # create PKG_CONFIG_PATH for installed dune modules
 if test -d "$PREFIX_DIR/lib/pkgconfig"; then
@@ -91,7 +91,7 @@ fi
 ###############################################

 onbuildfailure() {
-  echo "Terminating $(basename $0) due to previous errors!" >&2
+  echo "Terminating $(basename "$0") due to previous errors!" >&2
  exit 1
 }

@@ -136,14 +136,14 @@ build_module() {
    local runcommand=run_$command

    # build the modules
-    local path=$(eval "echo \$PATH_${module}")
+    local path="$(eval "echo \$PATH_${module}")"
    eval echo "--- calling $command for \$NAME_${module} ---"
 	trap onbuildfailure EXIT
    if ! (
      set -e
      cd "$path"
      export module
-      eval_control $runcommand $path/$CONTROL
+      eval_control $runcommand "$path/$CONTROL"
    ); then eval echo "--- Failed to build \$NAME_${module} ---"; exit 1; fi
 	trap onfailure EXIT

@@ -530,22 +530,22 @@ run_default_update () {
 }

 run_default_autogen () {
-  if test "x$USE_CMAKE" != "xyes" || test  ! -e $(eval "echo \$PATH_$module")/CMakeLists.txt ; then
+  if test "x$USE_CMAKE" != "xyes" || test  ! -e "$(eval "echo \$PATH_$module")/CMakeLists.txt" ; then
    PARAMS="$CMD_FLAGS"
    local M4_PATH=""
    if test -f configure.ac && \
       ( test -d .svn || test -d .git || test -d CVS || test -f stamp-vc ); then
      sort_modules $FOUND_MODULES
      for m in $FOUND_MODULES; do
-        path=$(eval "echo \$PATH_$m")
-        MODULE_PATHS="$MODULE_PATHS$path "
+        path="$(eval "echo \$PATH_$m")"
+        MODULE_PATHS="$MODULE_PATHS\"$path\" "
      done
      if test -f autogen.sh; then
        eval echo "WARNING: \$NAME_$module contains obsolete autogen.sh," \
            >&2
        echo "         dune-autogen is used instead." >&2
      fi
-      eval "$PREFIX_DIR/bin/dune-autogen" "$MODULE_PATHS" "$PARAMS" || exit 1
+      eval "\"$PREFIX_DIR/bin/dune-autogen\"" "$MODULE_PATHS" "$PARAMS" || exit 1
    else
      echo Skipping dune-autogen
    fi
@@ -556,7 +556,7 @@ run_default_autogen () {

 run_default_configure () {
  PARAMS="$CMD_FLAGS"
-  if test "x$USE_CMAKE" = "xyes" && test -e $(eval "echo \$PATH_$module")/CMakeLists.txt; then
+  if test "x$USE_CMAKE" = "xyes" && test -e "$(eval "echo \$PATH_$module")/CMakeLists.txt"; then
    LOCAL_USE_CMAKE=yes
  else
    LOCAL_USE_CMAKE=no
@@ -571,7 +571,7 @@ run_default_configure () {
    # get dependencies & suggestions
    sort_modules $module
    for m in $MODULES; do
-      path=$(eval "echo \$PATH_$m")
+      path="$(eval "echo \$PATH_$m")"
      if test "x$LOCAL_USE_CMAKE" = "xyes"; then
          #
          # Translate the configure PARMS to cmake
@@ -623,8 +623,8 @@ run_default_configure () {
      test -d "$BUILDDIR" || mkdir "$BUILDDIR"
      SRCDIR="$PWD"
      cd "$BUILDDIR"
-      echo "$PREPARAMS $CMAKE -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_MODULE_PATH=\"$CMAKE_MODULE_PATH\" $CMAKE_PARAMS $CMAKE_FLAGS $SRCDIR"
-      eval $PREPARAMS $CMAKE "-DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_MODULE_PATH=\"$CMAKE_MODULE_PATH\" $CMAKE_PARAMS $CMAKE_FLAGS $SRCDIR" || exit 1
+      echo "$PREPARAMS $CMAKE -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_MODULE_PATH=\"$CMAKE_MODULE_PATH\" $CMAKE_PARAMS $CMAKE_FLAGS \"$SRCDIR\""
+      eval $PREPARAMS $CMAKE "-DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_MODULE_PATH=\"$CMAKE_MODULE_PATH\" $CMAKE_PARAMS $CMAKE_FLAGS \"$SRCDIR\"" || exit 1
    else
      PARAMS="$PARAMS ACLOCAL_AMFLAGS=\"$ACLOCAL_FLAGS\""
      echo ./configure "$PARAMS"
@@ -686,13 +686,13 @@ run_default_git () {
 ###

 onfailure() {
-  echo "Execution of $(basename $0) terminated due to errors!" >&2
+  echo "Execution of $(basename "$0") terminated due to errors!" >&2
  exit 1
 }

 usage () {
  (
-    echo "Usage: $(basename $0) [OPTIONS] COMMANDS [COMMAND-OPTIONS]"
+    echo "Usage: $(basename "$0") [OPTIONS] COMMANDS [COMMAND-OPTIONS]"
    echo ""
    echo "  Execute COMMANDS for all Dune modules found. All entries in the"
    echo "  DUNE_CONTROL_PATH variable are scanned recursively for Dune modules."
@@ -747,7 +747,7 @@ create_module_list() {
    fi

    export MODULES=
-    RESUME="`cat $RESUME_FILE`"
+    RESUME="`cat "$RESUME_FILE"`"
    for a in $RESUME ; do
        export NAME_`fix_variable_name $a`="$a"
        fix_and_assign MODULE "$a"
@@ -940,7 +940,7 @@ case "$command" in
    create_module_list
    DUNE_CONTROL_PATH=""
    for mod in $MODULES; do
-      path=$(eval echo \$PATH_$mod)
+      path="$(eval echo \$PATH_$mod)"
      name=$(eval echo \$NAME_$mod)
      if test -f "$path/dune.module"; then
        export DUNE_CONTROL_PATH="$DUNE_CONTROL_PATH:$path/dune.module"
@@ -982,7 +982,7 @@ case "$command" in
      exit 1
    fi
    mainmod=`echo $SEARCH_MODULES`
-    eval mainmodpath=\$PATH_$mainmod
+    eval mainmodpath="\$PATH_$mainmod"
    fname="$mainmodpath/dependencies.m4"
    name=`eval echo \\${NAME_$mainmod}`
    version=`eval echo \\${VERS_$mainmod}`
@@ -1044,7 +1044,7 @@ case "$command" in
    echo "        suggests $suggestsall"
      AC_MACRO_DIR="."
      test ! -d m4 || AC_MACRO_DIR=m4
-    cat > $fname <<EOF
+    cat > "$fname" <<EOF
 # dependencies.m4 generated by dunecontrol

 m4_define([DUNE_AC_INIT],[
@@ -1067,7 +1067,7 @@ EOF
      mod=$(fix_variable_name $name)
      MOD=`echo $mod | tr [:lower:] [:upper:]`
      if test "x$(eval echo \$HAVE_$mod)" = "x"; then
-        cat >> $fname <<EOF
+        cat >> "$fname" <<EOF
  ### add a conditional check for $name,
  # just in case the module is not available at autogen time
  AM_CONDITIONAL([HAVE_${MOD}], false)
@@ -1080,7 +1080,7 @@ EOF
    for mod in $SORTEDMODULES_DEPS; do
      name=`eval echo \\$NAME_$mod`
      MOD=`echo $mod | tr [:lower:] [:upper:]`
-      cat >> $fname <<EOF
+      cat >> "$fname" <<EOF
  ### check dependency $name
  # invoke checks required by this module
  AC_REQUIRE([${MOD}_CHECKS])
@@ -1095,7 +1095,7 @@ EOF
    for mod in $SORTEDMODULES_SUGS; do
      name=`eval echo \\$NAME_$mod`
      MOD=`echo $mod | tr [:lower:] [:upper:]`
-      cat >> $fname <<EOF
+      cat >> "$fname" <<EOF
  ### check suggestion $name
  # invoke checks required by this module
  AC_REQUIRE([${MOD}_CHECKS])
@@ -1112,12 +1112,12 @@ EOF
      mod=$mainmod
      name=`eval echo \\$NAME_$mod`
      MOD=`echo $mod | tr [:lower:] [:upper:]`
-      cat >> $fname <<EOF
+      cat >> "$fname" <<EOF
  ### invoke checks for $name
  AC_REQUIRE([${MOD}_CHECKS])
 EOF
    fi
-    cat >> $fname <<EOF
+    cat >> "$fname" <<EOF
 ])
 EOF
  ;;
@@ -1128,6 +1128,17 @@ EOF
    usage
  ;;
  *)
+    set +e
+    if test "x$USE_CMAKE" = "xno"; then
+      echo "$PREFIX_DIR" |grep "[ 	]" >/dev/null
+     if test "$?" -eq "0"; then
+        echo "ERROR: The prefix directory path ($PREFIX_DIR) contains spaces. This is not"
+        echo "       supported when using autotools."
+        echo "       Either rename the path or activate CMake with --use-cmake switch."
+        exit 1
+      fi
+    fi
+    set -e
    if test "$1" = "update"; then export SKIPVERSIONCHECK=yes; fi
    check_commands "$@"
    create_module_list
@@ -1152,7 +1163,7 @@ EOF

      if test -n "$RESUME_FILE"; then
          # remove the current module from the resume file
-          modules_togo=`cat $RESUME_FILE`
+          modules_togo=`cat "$RESUME_FILE"`
          for mod_togo in $modules_togo ; do
              if test "$mod_togo" != "$mod" ; then
                  echo "$mod_togo"

--- a/bin/dunedoxynize
+++ b/bin/dunedoxynize
@@ -10,9 +10,9 @@ DOXYDIR="doc/doxygen/"

 find_doxystyle()
 {
-  for i in `dirname $0`/../doc/doxygen/Doxystyle `dirname $0`/../share/dune-common/doc/doxygen/Doxystyle; do
+  for i in "`dirname "$0"`/../doc/doxygen/Doxystyle" "`dirname "$0"`/../share/dune-common/doc/doxygen/Doxystyle"; do
    if [ -f "$i" ]; then
-      export DOXYSTYLE=$i
+      export DOXYSTYLE="$i"
      return 0
    fi
  done
@@ -92,7 +92,7 @@ generate_doxyout()
 {
  echo "Generating $DOXYOUT from "
  echo "    global style"
-  cat $DOXYSTYLE > $DOXYOUT
+  cat "$DOXYSTYLE" > "$DOXYOUT"
  while [ -n "$1" ]; do
    for DOXY in Doxylocal Doxyfile.in Doxyfile; do
 	  if [ "$1/$DOXYDIR/$DOXY" -ef "$DOXYOUT" ]; then continue; fi

--- a/bin/duneproject
+++ b/bin/duneproject
@@ -51,7 +51,7 @@ canonicalpath(){
     echo Usage: canonicalpath path >&2
     return 1
  fi
-  dirname $(canonicalname "$1")
+  dirname "$(canonicalname "$1")"
 }

 pkg_config_dependencies(){
@@ -145,10 +145,10 @@ echo

 ################## FIND AVAILABLE MODULES ##################

-. $(canonicalpath $0)/../lib/dunemodules.lib
+. "$(canonicalpath $0)/../lib/dunemodules.lib"

 # create PKG_CONFIG_PATH for installed dune modules
-export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$(canonicalpath $0)/../lib/pkgconfig"
+export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:\"$(canonicalpath $0)/../lib/pkgconfig\""

 # search for modules, both installed and src modules
 find_modules_in_path
@@ -944,7 +944,7 @@ set(@DUNE_MOD_NAME@_CXX_FLAGS_DEBUG "@CMAKE_CXX_FLAGS_DEBUG@")
 set(@DUNE_MOD_NAME@_CXX_FLAGS_MINSIZEREL "@CMAKE_CXX_FLAGS_MINSIZEREL@")
 set(@DUNE_MOD_NAME@_CXX_FLAGS_RELEASE "@CMAKE_CXX_FLAGS_RELEASE@")
 set(@DUNE_MOD_NAME@_CXX_FLAGS_RELWITHDEBINFO "@CMAKE_CXX_FLAGS_RELWITHDEBINFO@")
-set(@DUNE_MOD_NAME@_MODULE_PATH "@DUNE_INSTALL_MODULEDIR@")
+set(@DUNE_MOD_NAME@_MODULE_PATH "\${_prefix}/@DUNE_INSTALL_MODULEDIR@")
 set(@DUNE_MOD_NAME@_LIBRARIES "") # list libraries
 set(@DUNE_MOD_NAME@_DEPENDS "@DUNE_DEPENDS@")
 set(@DUNE_MOD_NAME@_SUGGESTS "@DUNE_SUGGESTS@")

--- a/cmake/modules/DuneMPI.cmake
+++ b/cmake/modules/DuneMPI.cmake
@@ -34,6 +34,11 @@ if(MPI_CXX_FOUND)
  set(MPI_DUNE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} ${MPI_C_LIBRARIES} CACHE STRING
    "Libraries used by DUNE when linking MPI programs")

+  set_property(GLOBAL APPEND PROPERTY ALL_PKG_FLAGS "-DENABLE_MPI=1 -DMPICH_SKIP_MPICXX -DMPIPP_H")
+  foreach(dir ${MPI_DUNE_INCLUDE_PATH})
+    set_property(GLOBAL APPEND PROPERTY ALL_PKG_FLAGS "-I${dir}")
+  endforeach()
+
  # Check whether the MPI-2 standard is supported
  include(CMakePushCheckState)
  include(CheckFunctionExists)

--- a/cmake/modules/FindGMP.cmake
+++ b/cmake/modules/FindGMP.cmake
@@ -23,7 +23,7 @@ include(CMakePushCheckState)
 cmake_push_check_state()
 set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${GMP_INCLUDE_DIR})
 include(CheckIncludeFileCXX)
-check_include_file_cxx("gmpxx.h" GMP_FOUND)
+check_include_file_cxx("gmpxx.h" GMP_HEADER_WORKS)

 # look for library gmp, only at positions given by the user
 find_library(GMP_LIB gmp
@@ -44,10 +44,9 @@ find_library(GMPXX_LIB gmpxx
 find_library(GMPXX_LIB gmpxx)

 # check if library works
-set(GMP_FOUND "GMP_FOUND-NOTFOUND")
 if(GMP_LIB AND GMPXX_LIB)
  include(CheckSymbolExists)
-  check_symbol_exists(__gmpz_abs ${GMP_LIB} GMP_FOUND)
+  check_symbol_exists(__gmpz_abs ${GMP_LIB} GMPXX_LIB_WORKS)
 endif(GMP_LIB AND GMPXX_LIB)
 cmake_pop_check_state()

@@ -56,7 +55,7 @@ include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
  "GMP"
  DEFAULT_MSG
-  GMP_INCLUDE_DIR GMP_LIB GMPXX_LIB GMP_FOUND
+  GMP_INCLUDE_DIR GMP_LIB GMPXX_LIB GMP_HEADER_WORKS GMPXX_LIB_WORKS
 )

 mark_as_advanced(GMP_LIB GMPXX_LIB GMP_INCLUDE_DIR)
@@ -81,7 +80,7 @@ else(GMP_FOUND)
 endif(GMP_FOUND)

 # set HAVE_GMP for config.h
-set(HAVE_GMP GMP_FOUND)
+set(HAVE_GMP ${GMP_FOUND})

 #add all GMP related flags to ALL_PKG_FLAGS, this must happen regardless of a target using add_dune_gmp_flags
 if(HAVE_GMP)

--- a/cmake/pkg/dune-common-config.cmake.in
+++ b/cmake/pkg/dune-common-config.cmake.in
@@ -20,5 +20,5 @@ set(@DUNE_MOD_NAME@_SCRIPT_SOURCE_DIR "${_prefix}/share/cmake/scripts")
 set(DOXYSTYLE_FILE "${_prefix}/share/doc/dune-common/doxygen/Doxystyle")
 set(@DUNE_MOD_NAME@_DEPENDS "@DUNE_DEPENDS@")
 set(@DUNE_MOD_NAME@_SUGGESTS "@DUNE_SUGGESTS@")
-set(@DUNE_MOD_NAME@_MODULE_PATH "@DUNE_INSTALL_MODULEDIR@")
-endif(NOT @DUNE_MOD_NAME@_FOUND)
\ No newline at end of file
+set(@DUNE_MOD_NAME@_MODULE_PATH "${_prefix}/@DUNE_INSTALL_MODULEDIR@")
+endif(NOT @DUNE_MOD_NAME@_FOUND)
--- a/cmake/scripts/BuildTests.cmake.in
+++ b/cmake/scripts/BuildTests.cmake.in
@@ -4,6 +4,5 @@ MACRO(get_directory_test_target _target _dir)
 ENDMACRO(get_directory_test_target _target _dir)

 get_directory_test_target(_build_test_target "@CMAKE_CURRENT_BINARY_DIR@")
-message("binary_dir=@CMAKE_CURRENT_BINARY_DIR@")
 execute_process(COMMAND @CMAKE_COMMAND@ --build @CMAKE_BINARY_DIR@ 
  --target ${_build_test_target})
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -17,6 +17,9 @@ DOCFILES_EXTRA = example.opts

 EXTRA_DIST = CMakeLists.txt $(PAGES) example.opts

+man_MANS = dunecontrol.1
+dist_man_MANS = dunecontrol.1
+
 # include rules for wml -> html transformation
 include $(top_srcdir)/am/webstuff


--- a/doc/dunecontrol.1
+++ b/doc/dunecontrol.1
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH DUNECONTROL 1 "November 26, 2013"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+dunecontrol \- Control program for the Dune build system
+.SH SYNOPSIS
+.B dunecontrol
+[\fIOPTIONS\fP] \fICOMMANDS\fP [\fICOMMAND-OPTIONS\fP]
+.SH DESCRIPTION
+.B dunecontrol
+is the control program for the build system of the Dune libraries.
+
+The Dune libraries form a set of modules.  Each can be built independently using either
+the AutoTools or cmake.  Additionally, though, there are dependencies between modules,
+which are expected to form a directed acyclic graph.  These dependencies are set in a
+file called
+.B dune.module
+contained in the main directory of a Dune module.
+
+The
+.B dunecontrol
+program helps to build sets of inter-dependent modules.  It allows to construct
+the entire dependency graph and obtain information about it.  Then it allows to give various build-related
+commands for all modules.  These are executed in the order mandated by the dependency graph.
+
+.SH COMMANDS
+Colon-separated list of commands. Available commands are:
+.HP
+.B help
+.IP
+Shows a help message and exits
+.HP
+.B print
+.IP
+Print the list of modules sorted after their dependencies
+.HP
+.B info
+.IP
+Same as `print', but including whether it is a dependency or suggestion
+.HP
+.B printdeps
+.IP
+Print recursive dependencies of a module
+.HP
+.B vcsetup
+.IP
+Setup version control repository (Git etc.) or working copy (SVN)
+.HP
+.B update
+.IP
+Update all modules from the repository
+.HP
+.B autogen
+.IP
+Run the autogen.sh script for each module. Does nothing, if CMake is activated
+.HP
+.B configure
+.IP
+Run configure or cmake for each module
+.HP
+.B make
+.IP
+Run make for each module
+.HP
+.B all
+.IP
+Run the 'autogen', 'configure' and 'make' commands for each module
+.HP
+.B exec
+.IP
+Execute an arbitrary command in each module source directory
+.HP
+.B bexec
+.IP
+Execute an arbitrary command in each module build directory
+.HP
+.B status
+.IP
+Show version control status for all modules
+.HP
+.B svn
+.IP
+Run svn command for each svn managed module
+.HP
+.B git
+.IP
+Run git command for each git managed module
+.HP
+.B export
+.IP
+Run eval `dunecontrol export` to save the list of dune.module files to the DUNE_CONTROL_PATH variable
+.SH OPTIONS
+.HP
+\fB\-h\fP, \fB\-\-help\fP
+.IP
+Show this help
+.HP
+\fB--debug\fP
+.IP
+Run with debuggin output enabled
+.HP
+\fB--use-cmake\fP
+.IP
+Use cmake instead of the AutoTools for building individual modules
+.HP
+\fB--module=\fP\fImod\fP
+.IP
+Only apply the actions on module
+.I mod
+and all modules it depends on
+.HP
+\fB--only=\fP\fImod\fP
+.IP
+Only apply the actions on module
+.I mod
+, but not the modules it depends on
+.HP
+\fB--current\fP
+.IP
+Only apply the actions on the current module, the one whose source tree we are in
+.HP
+\fB--resume\fP
+.IP
+Resume a previous run (only consider the modules not built successfully on the previous run)
+.HP
+\fB--skipfirst\fP
+.IP
+Skip the first module (use with --resume)
+.HP
+\fB--opts=\fP\fIfile\fP
+.IP
+Load default options from \fIfile\fP (see dune-common/doc/example.opts)
+.HP
+\fB--builddir=\fP\fIname\fP
+.IP
+Make out-of-source builds in a subdir \fIname\fP. This directory is created inside each module.
+.HP
+\fB--[COMMAND]-opts=\fP\fIopts\fP
+.IP
+Set options for COMMAND (this is mainly useful for the 'all' COMMAND)
+
+
+.SH ENVIRONMENT VARIABLES
+.B dunecontrol
+looks for Dune modules in all directories given in the
+.B DUNE_CONTROL_PATH
+variable, and additionally recursively in all subdirectories of those directories.
+The default for the case that DUNE_CONTROL_PATH is empty is the current directory,
+plus a system-wide installation in /usr.
+
+.SH AUTHOR
+Dune was written by the Dune team (www.dune-project.org/people).
+.PP
+This manual page was written by Oliver Sander.
+
+.SH COPYRIGHT
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without any warranty.
--- a/dune.module
+++ b/dune.module
 Module: dune-common
-Version: 2.3-svn
+Version: 2.3
 Maintainer: dune-devel@dune-project.org
 Whitespace-Hook: Yes
--- a/dune/common/parallel/remoteindices.hh
+++ b/dune/common/parallel/remoteindices.hh
@@ -693,7 +693,6 @@ namespace Dune {

    typedef SLList<GlobalIndex,Allocator> GlobalList;
    typedef typename GlobalList::ModifyIterator GlobalModifyIterator;
-    RemoteIndices<ParallelIndexSet>* remoteIndices_;
    RemoteIndexList* rList_;
    const ParallelIndexSet* indexSet_;
    GlobalList* glist_;

--- a/dune/common/test/eigenvaluestest.cc
+++ b/dune/common/test/eigenvaluestest.cc
@@ -15,6 +15,7 @@
 #include <dune/common/fvector.hh>
 #include <dune/common/dynmatrixev.hh>

+#include <algorithm>
 #include <complex>



--- a/lib/dunemodules.lib
+++ b/lib/dunemodules.lib
@@ -46,7 +46,7 @@ BLANK="$space$tab"
 PARSER_TRIM="awk '{gsub(/^[ \\t]+|[ \\t]+$/,\"\");printf(\"%s\", \$0);}'"
 parse_control() {
  # check file existence
-  if test ! -f "$1" -o "$(basename $1)" != "$CONTROL"; then
+  if test ! -f "$1" -o "$(basename "$1")" != "$CONTROL"; then
    echo "ERROR: '$1' is no $CONTROL file" >&2
    exit 1
  fi
@@ -164,7 +164,7 @@ parse_control() {
 # try to setup the control path
 #
 setup_control_path() {
-  if test -z $DUNE_CONTROL_PATH; then
+  if test -z "$DUNE_CONTROL_PATH"; then
    DUNE_CONTROL_PATH=.
    # try pkg-config locations
    if ! pkg-config dune-common; then
@@ -189,7 +189,7 @@ setup_control_path() {
  local TMP=""
  # foreach dir in $@
  while read dir; do
-    TMP=$TMP:"$(canonicalname $dir)"
+    TMP=$TMP:"$(canonicalname "$dir")"
  done <<EOF
    $(echo $DUNE_CONTROL_PATH | sed -e 's/:\+/:/g' | tr ':' '\n')
 EOF
@@ -427,7 +427,7 @@ eval_control() {
      # load functions defined in $file
      # if $command is not defined in $file,
      # then the default implementation will be executed
-      eval "$($GREP -v "^[-$ALNUM]\{1,\}:" $file)"
+      eval "$($GREP -v "^[-$ALNUM]\{1,\}:" "$file")"
      # execute $command
      $command
    ) || false

--- a/m4/dune.m4
+++ b/m4/dune.m4
@@ -356,7 +356,7 @@ AC_DEFUN([DUNE_CHECK_MODULES],[
    #
    AS_IF([test -d "$with_[]_dune_module"],[
      # expand tilde / other stuff
-      _DUNE_MODULE[]_ROOT=`cd $with_[]_dune_module && pwd`
+      _DUNE_MODULE[]_ROOT=`cd "$with_[]_dune_module" && pwd`
      _DUNE_MODULE[]_LIBDIR="$_DUNE_MODULE[]_ROOT/lib"

      # expand search path (otherwise empty CPPFLAGS)
@@ -370,14 +370,14 @@ AC_DEFUN([DUNE_CHECK_MODULES],[
        _DUNE_MODULE[]_SRCDIR=$_DUNE_MODULE[]_ROOT
        echo "testing $_DUNE_MODULE[]_ROOT/CMakeCache.txt"
        # extract src and build path from Makefile or CMakeCache.txt, if found
-        AS_IF([test -f $_DUNE_MODULE[]_ROOT/CMakeCache.txt],[
-          _DUNE_MODULE[]_SRCDIR="`sed -ne '/^[]_dune_name[]_SOURCE_DIR:STATIC=/{s/^[]_dune_name[]_SOURCE_DIR:STATIC=//; p;}' $_DUNE_MODULE[]_ROOT/CMakeCache.txt`"
+        AS_IF([test -f "$_DUNE_MODULE[]_ROOT/CMakeCache.txt"],[
+          _DUNE_MODULE[]_SRCDIR="`sed -ne '/^[]_dune_name[]_SOURCE_DIR:STATIC=/{s/^[]_dune_name[]_SOURCE_DIR:STATIC=//; p;}' "$_DUNE_MODULE[]_ROOT/CMakeCache.txt"`"
          echo srcdir=$_DUNE_MODULE[]_SRCDIR
-                ],[test -f $_DUNE_MODULE[]_ROOT/Makefile],[
-          _DUNE_MODULE[]_SRCDIR="`sed -ne '/^abs_top_srcdir = /{s/^abs_top_srcdir = //; p;}' $_DUNE_MODULE[]_ROOT/Makefile`"
+                ],[test -f "$_DUNE_MODULE[]_ROOT/Makefile"],[
+          _DUNE_MODULE[]_SRCDIR="`sed -ne '/^abs_top_srcdir = /{s/^abs_top_srcdir = //; p;}' "$_DUNE_MODULE[]_ROOT/Makefile"`"
 		])
        _dune_cm_CPPFLAGS="-I$_DUNE_MODULE[]_SRCDIR"
-        _DUNE_MODULE[]_VERSION="`grep Version $_DUNE_MODULE[]_SRCDIR/dune.module | sed -e 's/^Version: *//'`" 2>/dev/null
+        _DUNE_MODULE[]_VERSION="`grep Version "$_DUNE_MODULE[]_SRCDIR/dune.module" | sed -e 's/^Version: *//'`" 2>/dev/null
        AS_IF([test -f "$_DUNE_MODULE[]_LIBDIR[]/lib[]_dune_lib[].la"], [
          # local modules is linked directly via the .la file
          _dune_cm_LIBS="$_DUNE_MODULE[]_LIBDIR[]/lib[]_dune_lib[].la"],[
No results found