* tests/accu/Makefile.am: Remove uses of the old HAVE_BOOST_PREPROCESSOR conditional. * tests/unit_test/cond_tests_boost-preprocessor_boost-tuple: Rename as... * milena/tests/unit_test/cond_tests_boost-tuple: ...this. * tests/unit_test/Makefile.am (COND_TESTS): s/cond_tests_boost-preprocessor_boost-tuple/cond_tests_boost-tuple/. * tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 13 +++++++++++++ milena/tests/accu/Makefile.am | 10 ++-------- milena/tests/unit_test/Makefile.am | 10 +++++----- ...rocessor_boost-tuple => cond_tests_boost-tuple} | 0 milena/tests/unit_test/unit-tests.mk | 6 ++---- 5 files changed, 22 insertions(+), 17 deletions(-) rename milena/tests/unit_test/{cond_tests_boost-preprocessor_boost-tuple => cond_tests_boost-tuple} (100%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5feeb2c..0a495d7 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,16 @@ +2010-10-21 Roland Levillain <roland@lrde.epita.fr> + + Catch up with Boost-related changes in configure.ac. + + * tests/accu/Makefile.am: Remove uses of the old + HAVE_BOOST_PREPROCESSOR conditional. + * tests/unit_test/cond_tests_boost-preprocessor_boost-tuple: + Rename as... + * milena/tests/unit_test/cond_tests_boost-tuple: ...this. + * tests/unit_test/Makefile.am (COND_TESTS): + s/cond_tests_boost-preprocessor_boost-tuple/cond_tests_boost-tuple/. + * tests/unit_test/unit-tests.mk: Regen. + 2010-10-21 Guillaume Lazzara <z@lrde.epita.fr> Make use of value::next in Milena. diff --git a/milena/tests/accu/Makefile.am b/milena/tests/accu/Makefile.am index cefa42c..7c0790a 100644 --- a/milena/tests/accu/Makefile.am +++ b/milena/tests/accu/Makefile.am @@ -51,15 +51,9 @@ transform_directional_SOURCES = transform_directional.cc transform_line_SOURCES = transform_line.cc transform_snake_SOURCES = transform_snake.cc - -if HAVE_BOOST_PREPROCESSOR if HAVE_BOOST_TUPLE - -check_PROGRAMS += tuple -tuple_SOURCES = tuple.cc - + check_PROGRAMS += tuple + tuple_SOURCES = tuple.cc endif HAVE_BOOST_TUPLE -endif HAVE_BOOST_PREPROCESSOR - TESTS = $(check_PROGRAMS) diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am index d53d578..b5c8803 100644 --- a/milena/tests/unit_test/Makefile.am +++ b/milena/tests/unit_test/Makefile.am @@ -17,11 +17,11 @@ include $(top_srcdir)/milena/tests/tests.mk -COND_TESTS = cond_tests_boost-preprocessor_boost-tuple \ - cond_tests_cfitsio \ - cond_tests_gdcm \ - cond_tests_magickxx \ - cond_tests_qt \ +COND_TESTS = cond_tests_boost-tuple \ + cond_tests_cfitsio \ + cond_tests_gdcm \ + cond_tests_magickxx \ + cond_tests_qt \ cond_tests_tiff EXTRA_DIST = disabled_tests \ diff --git a/milena/tests/unit_test/cond_tests_boost-preprocessor_boost-tuple b/milena/tests/unit_test/cond_tests_boost-tuple similarity index 100% rename from milena/tests/unit_test/cond_tests_boost-preprocessor_boost-tuple rename to milena/tests/unit_test/cond_tests_boost-tuple diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 5751682..71543be 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -3,16 +3,14 @@ check_PROGRAMS = # Starting a conditional unit test list. -if HAVE_BOOST_PREPROCESSOR if HAVE_BOOST_TUPLE check_PROGRAMS += \ mln_accu_tuple -mln_accu_tuple_CPPFLAGS= ${BOOST_TUPLE_CPPFLAGS} ${BOOST_PREPROCESSOR_CPPFLAGS} ${AM_CPPFLAGS} -mln_accu_tuple_LDFLAGS= ${BOOST_TUPLE_LDFLAGS} ${BOOST_PREPROCESSOR_LDFLAGS} ${AM_LDFLAGS} +mln_accu_tuple_CPPFLAGS= ${BOOST_TUPLE_CPPFLAGS} ${AM_CPPFLAGS} +mln_accu_tuple_LDFLAGS= ${BOOST_TUPLE_LDFLAGS} ${AM_LDFLAGS} mln_accu_tuple_SOURCES = mln_accu_tuple.cc endif HAVE_BOOST_TUPLE -endif HAVE_BOOST_PREPROCESSOR # Starting a conditional unit test list. if HAVE_CFITSIO -- 1.5.6.5