--- ChangeLog | 4 ++++ configure.ac | 5 ++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b63a9a3..2c3ec15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-01-18 Guillaume Lazzara <z@lrde.epita.fr> + + * configure.ac: Make Boost dependency optional. + 2010-11-29 Roland Levillain <roland@lrde.epita.fr> Honor `--without-qt' in configure. diff --git a/configure.ac b/configure.ac index 1febf2c..1146d9b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright (C) 2006, 2007, 2008, 2009, 2010 EPITA Research and +# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 EPITA Research and # Development Laboratory (LRDE). # # This file is part of Olena. @@ -194,6 +194,9 @@ AM_CONDITIONAL([DARWIN], [echo "$host_os" | grep '^darwin']) # Boost. # # ------- # +# Check if Boost is available, if not just print a warning, otherwise +# look for boost:tuple. +BOOST_REQUIRE(1.3, [AC_DEFINE([HAVE_BOOST], [0])]) BOOST_TUPLE AM_CONDITIONAL([HAVE_BOOST_TUPLE], [test "x$ac_cv_header_boost_tuple_tuple_hpp" = xyes]) -- 1.5.6.5