diff --git a/CHANGELOG b/CHANGELOG index 68abe3e73794f4a03ce5f6ab401509752c6c07ba..3a02b5d7091aab1bc97953efd725a7aac3924119 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -38,6 +38,12 @@ Differences Between DuMuX 2.6 and DuMuX 2.7 printing only the first deviation from the reference solution, it now prints the maximum deviation in each field/variable. +* DEPRECATED BUILD SYSTEM: DuMuX 2.7 will be the last release which can be built + with the Autotools based build system. It is deprecated and will be removed + for DuMuX 2.8. We encourage the change towards CMake, especially with the + upcoming DUNE 2.4. + The warning can be suppressed with --disable-dumux-deprecated-autotools + * IMMEDIATE INTERFACE CHANGES not allowing/requiring a deprecation period: - Before, the "heatCapacity" function in the spatial parameters and volume variables of the implicit nonisothermal models was a misnomer, since it diff --git a/m4/Makefile.am b/m4/Makefile.am index 88e7b3bf0a6fe2140b59f90daaa73d0b26a57b94..54660c54cbff6554b9a5402c75732d1ca367979d 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -7,6 +7,7 @@ M4FILES = \ ac_prog_pdflatex.m4 \ cxx0x_constexpr.m4 \ dumux.m4 \ + dumux_deprecated_autotools.m4 \ dumux_quad.m4 aclocaldir = $(datadir)/aclocal diff --git a/m4/dumux.m4 b/m4/dumux.m4 index 7b23fa358f807104a4755a74455eb2ff8e561132..e94af3f510cee8b90fd46e28163449e87e24b88a 100644 --- a/m4/dumux.m4 +++ b/m4/dumux.m4 @@ -26,6 +26,8 @@ AC_DEFUN([DUMUX_CHECKS], if test "x$HAVE_CONSTEXPR" != "xyes"; then AC_DEFINE(constexpr, const, ['set 'constexpr' to 'const' if constexpr is not supported]) fi + + AC_REQUIRE([DUMUX_DEPRECATED_AUTOTOOLS]) ]) # checks only relevant for the dumux module itself but not for modules diff --git a/m4/dumux_deprecated_autotools.m4 b/m4/dumux_deprecated_autotools.m4 new file mode 100644 index 0000000000000000000000000000000000000000..539149925d044e7bc9d6e9bdab7efb68ca84453a --- /dev/null +++ b/m4/dumux_deprecated_autotools.m4 @@ -0,0 +1,16 @@ +dnl This macro introduces a configure flag --disable-dumux-deprecated-autotools +dnl to suppress the deprecration warning that Autotools will be removed in 2.8 + +AC_DEFUN([DUMUX_DEPRECATED_AUTOTOOLS],[ + AC_ARG_ENABLE(dumux-deprecated-autotools, + AS_HELP_STRING([--disable-dumux-deprecated-autotools],[Suppresses DuMuX' warning about deprecated Autotools support.])) + + AS_IF([test "x$enable_dumux_deprecated_autotools" != "xno"], + AC_DEFINE(ENABLE_DUMUX_DEPRECATED_AUTOTOOLS, 1, [Warn about deprecated Autotools support])) + + AH_BOTTOM([ +#if ENABLE_DUMUX_DEPRECATED_AUTOTOOLS +#warning Support for Autotools in DuMuX is deprecated and will be removed after 2.7. +#endif +]) +])