Commit de5d84fb authored by Andreas Lauser's avatar Andreas Lauser

build system: fine-tune the option files and the macros in dumux.m4

we disable MPI by default as it might result in compilation issues
with newer compilers and the models do not work reliably anyway. also
the conditionals for building the handbook are refined and
summary status messages are added for LaTeX and the handbook.

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@5033 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent cfc22b6f
......@@ -4,10 +4,8 @@ DUMUXDIR=$(find $OLDPWD -name "dune.module" | xargs grep -El '[[:space:]]*Module
# configure flags
CONFIGURE_FLAGS="CXXFLAGS=\"-I$DUMUXDIR -Wall -Wno-sign-compare -fno-strict-aliasing -g\" \
--enable-dunedevel \
--enable-debug \
--disable-doxygen \
--disable-documentation \
--enable-parallel \
--enable-documentation \
--disable-parallel \
--disable-mpiruntest"
# make all
......
# $id: $
if BUILD_HANDBOOK
if BUILD_DOCS
#EPS_FILES = EPS/tutorial-problemconfiguration.eps
TEXSOURCE = *.tex ./EPS/*.eps
MAINDOCS = dumux-handbook.dvi dumux-handbook.pdf dumux-handbook.ps
EXTRA_DIST = dumux-handbook.pdf
#Makefile.dist.in Makefile.dist.am
if CONVERT
DOCS = $(HTDOCS) $(MAINDOCS) $(WMLDOCS)
DOCS = $(HTDOCS) $(MAINDOCS) $(WMLDOCS)
endif
# setting like in dune-web
BASEDIR=../..
CURDIR=doc/handbook
......@@ -53,4 +48,3 @@ include $(top_srcdir)/am/global-rules
include $(top_srcdir)/am/latex
endif
endif
......@@ -68,7 +68,6 @@ AC_DEFUN([DUMUX_CHECKS],
AM_CONDITIONAL([TEX4HT], [test "x$TEX4HT" != xtrue])
AC_CHECK_PROGS([CONVERT], [convert], [false])
AM_CONDITIONAL([CONVERT], [test "x$CONVERT" != xfalse])
AM_CONDITIONAL([BUILD_HANDBOOK], [test -a "stamp-vc" -a "x$LATEX" != xtrue])
AC_CHECK_HEADER([valgrind/memcheck.h],
[HAVE_VALGRIND_H="1"],
......@@ -80,8 +79,26 @@ AC_DEFUN([DUMUX_CHECKS],
# check whether pardiso is installed (this is already in dune-common
# so we only use the results.)
# SET_PARDISO
DUNE_ADD_SUMMARY_ENTRY([Pardiso],[$acx_pardiso_ok])
# Add the latex and handbook status to the summary
have_latex=no
if test "x$LATEX" != "x"; then
have_latex=yes
fi
DUNE_ADD_SUMMARY_ENTRY([Latex],[$have_latex])
# only build the handbook if the documentation is build, latex is
# available and the tree is checked out via a version control system
build_handbook=no
if test "x$enable_documentation" != "xno" && \
test -a "$(pwd)/${top_srcdir}/stamp-vc" && \
test "$have_latex" == "yes"; then
build_handbook=yes
fi
AM_CONDITIONAL([BUILD_HANDBOOK], [test "$build_handbook" == "yes"])
DUNE_ADD_SUMMARY_ENTRY([Build handbook],[$build_handbook])
])
AC_DEFUN([DUMUX_CHECK_ALL],
......
......@@ -3,11 +3,9 @@ DUMUXDIR=$(find $OLDPWD -name "dune.module" | xargs grep -El '[[:space:]]*Module
# configure flags
CONFIGURE_FLAGS="CXXFLAGS=\"-I$DUMUXDIR -Wall -Wno-sign-compare -fno-strict-aliasing -O3 -march=native -DNDEBUG\" \
--enable-dunedevel \
--enable-debug \
--disable-doxygen \
--disable-dunedevel \
--disable-documentation \
--enable-parallel \
--disable-parallel \
--disable-mpiruntest"
# make all
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment