* tests/accu/Makefile.am (tuple_CPPFLAGS): New. * tests/unit_test/Makefile.am (BOOST_TUPLE_CPPFLAGS): New. --- milena/ChangeLog | 7 +++++++ milena/tests/accu/Makefile.am | 1 + milena/tests/unit_test/Makefile.am | 5 +++++ 3 files changed, 13 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index cbdb79b..8e94f5d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2010-10-27 Roland Levillain <roland@lrde.epita.fr> + + Fix Boost.Tuple handling. + + * tests/accu/Makefile.am (tuple_CPPFLAGS): New. + * tests/unit_test/Makefile.am (BOOST_TUPLE_CPPFLAGS): New. + 2010-10-26 Roland Levillain <roland@lrde.epita.fr> Fix Milena's distribution. diff --git a/milena/tests/accu/Makefile.am b/milena/tests/accu/Makefile.am index 7c0790a..d494d46 100644 --- a/milena/tests/accu/Makefile.am +++ b/milena/tests/accu/Makefile.am @@ -54,6 +54,7 @@ transform_snake_SOURCES = transform_snake.cc if HAVE_BOOST_TUPLE check_PROGRAMS += tuple tuple_SOURCES = tuple.cc + tuple_CPPFLAGS = $(AM_CPPFLAGS) $(BOOST_CPPFLAGS) endif HAVE_BOOST_TUPLE TESTS = $(check_PROGRAMS) diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am index b5c8803..4ee9885 100644 --- a/milena/tests/unit_test/Makefile.am +++ b/milena/tests/unit_test/Makefile.am @@ -51,6 +51,11 @@ $(srcdir)/unit-tests.mk: $(top_srcdir)/build-aux/build_unit_test.sh disabled_tes milena/tests/unit_test/disabled_tests \ mln +# Handling Boost.Tuple-dependent programs: `boost.m4' defines +# BOOST_CPPFLAGS, but `unit-tests.mk' expects BOOST_TUPLE_CPPFLAGS; +# help it by defining the later using the former. +BOOST_TUPLE_CPPFLAGS = $(BOOST_CPPFLAGS) + include $(srcdir)/unit-tests.mk MAINTAINERCLEANFILES = $(srcdir)/mln_*.cc -- 1.5.6.5