--- ChangeLog | 4 ++++ configure.ac | 36 ++++++++++++++++++++++-------------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 301ed5d..00d8c12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-08-13 Guillaume Lazzara <z(a)lrde.epita.fr> + + * configure.ac: Make Boost dependency optional. + 2010-08-12 Guillaume Lazzara <z(a)lrde.epita.fr> * build-aux/build_unit_test.sh: Handle composed dependency names diff --git a/configure.ac b/configure.ac index 108b827..ce1a5a2 100644 --- a/configure.ac +++ b/configure.ac @@ -215,20 +215,28 @@ if test "x$with_boost" != xno; then AC_MSG_RESULT([* Boost]) AC_MSG_RESULT([-------]) - # Preprocessor - BOOST_FIND_HEADER([boost/preprocessor/repetition/repeat.hpp], - oln_have_boost_preprocessor="no", - oln_have_boost_preprocessor="yes") - if test "x$oln_have_boost_preprocessor" = xyes; then - AC_DEFINE([HAVE_BOOST_PREPROCESSOR], 1, [Define to 1 if we can use Boost Preprocessor.]) - fi + # Is Boost installed? + BOOST_REQUIRE([], oln_have_boost=no) + + if test "x$oln_have_boost" != xno; then + + # Preprocessor + BOOST_FIND_HEADER([boost/preprocessor/repetition/repeat.hpp], + oln_have_boost_preprocessor=no, + oln_have_boost_preprocessor=yes) + if test "x$oln_have_boost_preprocessor" = xyes; then + AC_DEFINE([HAVE_BOOST_PREPROCESSOR], 1, + [Define to 1 if we can use Boost Preprocessor.]) + fi - # Tuple - BOOST_FIND_HEADER([boost/tuple/tuple.hpp], - oln_have_boost_tuple=no, - oln_have_boost_tuple=yes) - if test "x$oln_have_boost_tuple" = xyes; then - AC_DEFINE([HAVE_BOOST_TUPLE], 1, [Define to 1 if we can use Boost Tuple.]) + # Tuple + BOOST_FIND_HEADER([boost/tuple/tuple.hpp], + oln_have_boost_tuple=no, + oln_have_boost_tuple=yes) + if test "x$oln_have_boost_tuple" = xyes; then + AC_DEFINE([HAVE_BOOST_TUPLE], 1, + [Define to 1 if we can use Boost Tuple.]) + fi fi fi -- 1.5.6.5