diff options
| author | Jonathon Jongsma <jjongsma@gnome.org> | 2008-01-30 10:55:12 -0600 |
|---|---|---|
| committer | Jonathon Jongsma <jjongsma@gnome.org> | 2008-01-30 10:55:12 -0600 |
| commit | bdf0c9c560f05df92a39edc6c3d5034faf56b63c (patch) | |
| tree | 97c189ca78ff86f51bc48f649cf6d35d98ef6931 | |
| parent | 6a01afe2f703c4eb5300e417d8391f538bc25b81 (diff) | |
* configure.in: enable people with CAIROMM_DEVEL variable set to explicitly
deisable automated tests
* m4/ax_boost_unit_test_framework.m4: update to slightly newer boost
unittest checking scripts
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 13 | ||||
| -rw-r--r-- | m4/ax_boost_unit_test_framework.m4 | 3 |
3 files changed, 19 insertions, 4 deletions
@@ -1,3 +1,10 @@ +2008-01-30 Jonathon Jongsma <jjongsma@gnome.org> + + * configure.in: enable people with CAIROMM_DEVEL variable set to explicitly + deisable automated tests + * m4/ax_boost_unit_test_framework.m4: update to slightly newer boost + unittest checking scripts + 2007-11-10 Jonathon Jongsma <jjongsma@gnome.org> * cairomm/surface.cc: diff --git a/configure.in b/configure.in index 7163d3b..d03feca 100644 --- a/configure.in +++ b/configure.in @@ -108,9 +108,16 @@ AC_ARG_ENABLE(tests, AC_HELP_STRING([--enable-tests=yes|no], [enable automated tests (default is no)]), ENABLE_TESTS=$enableval, - ENABLE_TESTS=no) -if test x$CAIROMM_DEVEL = xon ; then - ENABLE_TESTS=yes + ENABLE_TESTS=auto) + +if test x$ENABLE_TESTS = xauto ; then + dnl unless explicitly disabled, attempt to enable tests for developers and + dnl disable it for others + if test x$CAIROMM_DEVEL = xon ; then + ENABLE_TESTS=yes + else + ENABLE_TESTS=no + fi fi if test x$ENABLE_TESTS = xyes ; then diff --git a/m4/ax_boost_unit_test_framework.m4 b/m4/ax_boost_unit_test_framework.m4 index 11e5d8d..6072b51 100644 --- a/m4/ax_boost_unit_test_framework.m4 +++ b/m4/ax_boost_unit_test_framework.m4 @@ -75,7 +75,8 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK], BN=boost_unit_test_framework if test "x$ax_boost_user_unit_test_framework_lib" = "x"; then saved_ldflags="${LDFLAGS}" - for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ + for ax_lib in $BN $BN-mt $BN-mt-s $BN-s \ + $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s lib$BN-$CC-s \ $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do LDFLAGS="${LDFLAGS} -l$ax_lib" |