--- ChangeLog | 5 +++++ build-aux/build_unit_test.sh | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a79da84..301ed5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2010-08-12 Guillaume Lazzara <z(a)lrde.epita.fr> + * build-aux/build_unit_test.sh: Handle composed dependency names + in cond_tests_* files. + +2010-08-12 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve configure output. * configure.ac: Improve configure output. diff --git a/build-aux/build_unit_test.sh b/build-aux/build_unit_test.sh index 65ba103..8492d64 100755 --- a/build-aux/build_unit_test.sh +++ b/build-aux/build_unit_test.sh @@ -33,13 +33,16 @@ ## "cond_tests_*" files must be created in the directory where ## unit-test.mk is generated (usually the unit-tests directory). ## -## WARNINGS: -## --------- +## NOTES +## ----- ## * Don't forget to add "cond_tests_*" files in the COND_TESTS ## variable in the right Makefile.am. ## ## * ALWAYS end "cond_tests_*" files with a new line! ## +## * If the dependency has a composed name use '-' to concatenate the words. +## (e.g., boost_tuple -> cond_tests_boost-tuple) +## ## FIXME: Don't use `echo -n', as echo's options are not portable. ## @@ -183,7 +186,8 @@ for f in $COND_TESTS; do COND_LIST="" while true; do name=`echo $fpostfix | cut -s -d '_' -f $i \ - | tr "[:lower:]" "[:upper:]"` + | tr "[:lower:]" "[:upper:]" \ + | sed -e 's/-/_/g'` i=$(($i+1)) if (test -z "$name"); then break; -- 1.5.6.5