Skip to content
Snippets Groups Projects
Commit f5ec507d authored by Christian Engwer's avatar Christian Engwer
Browse files

reverted patch 5046, as it shows a bug, when building dune-istl

[[Imported from SVN: r5047]]
parent 7c965b17
No related merge requests found
......@@ -242,19 +242,10 @@ AC_DEFUN([DUNE_CHECK_DISPATCH],[
[AC_MSG_ERROR([Unknown module $1])])
])
AC_DEFUN([_DUNE_MODULE_DEPENDENCIES],[
echo "Dependencies: !$1!"
ifelse($#, 0, , $#, 1, [DUNE_CHECK_DISPATCH($1)], [DUNE_CHECK_DISPATCH($1) _DUNE_MODULE_DEPENDENCIES(m4_shift($@))])
AC_DEFUN([DUNE_MODULE_DEPENDENCIES],[
ifelse($#, 0, , $#, 1, [DUNE_CHECK_DISPATCH($1)], [DUNE_CHECK_DISPATCH($1) DUNE_MODULE_DEPENDENCIES(m4_shift($@))])
])
AC_DEFUN([_PRINT],[--module=$1])
AC_DEFUN([_DUNE_MODULE_PARAM_EXPAND],
[ifelse($#, 0, , $#, 1, [--module=$1], [--module=$1 _DUNE_MODULE_PARAM_EXPAND(m4_shift($@))])])
AC_DEFUN([DUNE_MODULE_DEPENDENCIES],
[_DUNE_MODULE_DEPENDENCIES(m4_esyscmd(dunecontrol _DUNE_MODULE_PARAM_EXPAND($@) m4print))])
AC_DEFUN([DUNE_DEV_MODE],[
AC_ARG_ENABLE(dunedevel,
AC_HELP_STRING([--enable-dunedevel],[activate Dune-Developer-mode]))
......
......@@ -91,7 +91,7 @@ fi
AC_SUBST(DUNEWEBDIR, $with_duneweb)
dnl check all components
ifelse([x$@],[x], , [DUNE_MODULE_DEPENDENCIES($@)])
DUNE_MODULE_DEPENDENCIES($@)
AC_REQUIRE([DUNE_SET_MINIMAL_DEBUG_LEVEL])
AC_REQUIRE([DUNE_PATH_XDR])
AC_REQUIRE([DUNE_GRID_DIMENSION])
......@@ -192,7 +192,7 @@ AC_DEFUN([DUNE_CHECK_ALL_M],[
if test "x$with_revision" = "xno" ; then with_revision=bar; fi
AC_SUBST(revision, $with_revision)
ifelse([x$@],[x], , [DUNE_MODULE_DEPENDENCIES($@)])
DUNE_MODULE_DEPENDENCIES($@)
AC_REQUIRE([DUNE_CHECK_ALL])
AC_REQUIRE([DUNE_DEV_MODE])
AC_REQUIRE([DUNE_PKG_CONFIG_REQUIRES])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment