Commit bbae6aa9 authored by prudhomm's avatar prudhomm
Browse files

added DO_NOT_COMPILE facility if some features are not available in the system

(eg boost 1.32)
fixed CVS build failure
parent 24e42994
......@@ -35,7 +35,8 @@ EXTRA_DIST = configure.in.in configure.in.bot configure.in.mid subdirs configur
MAINTAINERCLEANFILES = configure.files subdirs
SUBDIRS = admin doc life testsuite tools
#SUBDIRS = admin doc life testsuite tools
SUBDIRS = $(TOPSUBDIRS)
include $(top_srcdir)/admin/Doxyfile.am
......
......@@ -60,8 +60,7 @@ AC_CHECK_BOOST
AC_CHECK_BOOST_GRAPH
AC_CHECK_BOOST_SIGNALS
AC_CHECK_BOOST_REGEX
AC_CHECK_BOOST_FILESYSTEM
AC_CHECK_BOOST_TEST
AC_CHECK_BOOST_UNIT_TEST_FRAMEWORK
......@@ -124,3 +123,5 @@ AC_CONFIG_TESTDIR(testsuite)
dnl pkgconfig
AX_CREATE_PKGCONFIG_INFO(life.pc,,[${LIFEV_LIBS} $LIBS],[Finite Element Library and more],[$CPPFLAGS $CFLAGS])
AC_CHECK_BOOST_PRG_EXEC_MONITOR
AC_CHECK_BOOST_FILESYSTEM
if test x$boost_filesystem_error = xyes -o x$boost_prg_exec_monitor_error = xyes; then
DO_NOT_COMPILE="$DO_NOT_COMPILE tools"
fi
Supports Markdown
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