diff --git a/m4/Makefile.am b/m4/Makefile.am index 7dd11177c356c99a4b72a20da4c4a4c4b13b8954..8546d8f9b1403d88a3738a79e389edcb29b82c8c 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -3,7 +3,7 @@ ALLM4S = acx_blas.m4 acx_lapack.m4 acx_mpi.m4 acx_pthread.m4 \ ax_check_gl.m4 ax_lang_compiler_ms.m4 dune_all.m4 \ dune_autobuild.m4 dune_common.m4 dune_compiler.m4 dune_deprecated.m4 \ - dune_docu.m4 dune_exprtmpl.m4 dune_griddim.m4 dune_linkcxx.m4 \ + dune_docu.m4 dune_exprtmpl.m4 dune_linkcxx.m4 \ dune.m4 \ dune_mpi.m4 dune_streams.m4 \ f5.m4 fortran_overwrite.m4 grape.m4 hdf5.m4 \ diff --git a/m4/dune_griddim.m4 b/m4/dune_griddim.m4 deleted file mode 100644 index 27c3a41be3b3a3c55b6f41990b7b3944290e321f..0000000000000000000000000000000000000000 --- a/m4/dune_griddim.m4 +++ /dev/null @@ -1,55 +0,0 @@ -# searches for grid_dim parameter - -# asks for grid-dim and pass to ALL_PKG_CPPFLAGS -AC_DEFUN([DUNE_GRID_DIMENSION],[ - -# default is disabled - AC_ARG_WITH(grid_dim, - AS_HELP_STRING([--with-grid-dim=1|2|3], - [dimension of grid; mainly used to determine grid - dimension during compilation (default=disabled)]), - , with_grid_dim=0) - AC_ARG_WITH(world_dim, - AS_HELP_STRING([-with-world-dim=1|2|3], - [dimension of world; mainly used to determine grid - dimension during compilation (default=grid-dim)]), - , with_world_dim=0) - - AC_ARG_WITH(grid_type, - AS_HELP_STRING([--with-grid-type= ALBERTAGRID | ALUGRID_CUBE | ALUGRID_SIMPLEX | ALUGRID_CONFORM | ONEDGRID | SGRID | UGGRID | YASPGRID], - [only enabled if grid-dim is given, sets type of grid (default=YASPGRID)]),, with_grid_type=YASPGRID) - -AS_IF([test "x$with_grid_dim" != "x0"],[ - - AC_MSG_CHECKING([grid-dim and grid-type]) - # make sure that given grid dim is valid - AS_IF([test "x$with_grid_dim" != "x1" -a "x$with_grid_dim" != "x2" -a "x$with_grid_dim" != "x3"],[ - AC_MSG_ERROR([Delivered grid-dim = $with_grid_dim is not valid. Valid are only 1, 2, or 3 .]) - ]) - - # make sure that given grid type is valid - AS_IF([test "x$with_grid_type" != "xALBERTAGRID" -a "x$with_grid_type" != "xALUGRID_CUBE" -a "x$with_grid_type" != "xALUGRID_SIMPLEX" -a "x$with_grid_type" != "xALUGRID_CONFORM" -a "x$with_grid_type" != "xONEDGRID" -a "x$with_grid_type" != "xSGRID" -a "x$with_grid_type" != "xUGGRID" -a "x$with_grid_type" != "xYASPGRID"],[ - AC_MSG_ERROR([Delivered grid-type = $with_grid_type is not valid. Run ./configure --help for valid values.]) - ]) - - variable_griddim="$``(``GRIDDIM``)``" - variable_worlddim="$``(``WORLDDIM``)``" - griddim_cppflags="-DGRIDDIM=$``(``GRIDDIM``)`` -DWORLDDIM=$``(``WORLDDIM``)`` -D$``(``GRIDTYPE``)``" - AC_SUBST(GRIDDIM, $with_grid_dim) - AS_IF([test "x$with_world_dim" = "x0"],[ - AC_SUBST(WORLDDIM, $variable_griddim) - ],[ - AC_SUBST(WORLDDIM, $with_world_dim) - ]) - AC_SUBST(GRIDDIMGRID, $variable_griddim ) - AC_SUBST(GRIDDIMWORLD, $variable_worlddim ) - AC_SUBST(GRIDTYPE, $with_grid_type ) - AC_SUBST(GRIDDIM_CPPFLAGS, $griddim_cppflags) - DUNE_PKG_CPPFLAGS="$DUNE_PKG_CPPFLAGS $griddim_cppflags" - AS_IF([test "x$with_world_dim" = "x0"],[ - AC_MSG_RESULT([yes (GRIDDIM=$GRIDDIM, WORLDDIM=GRIDDIM and GRIDTYPE=$GRIDTYPE)]) - ],[ - AC_MSG_RESULT([yes (GRIDDIM=$GRIDDIM, WORLDDIM=$WORLDDIM and GRIDTYPE=$GRIDTYPE)]) -]) -]) -])