From bdf0c9c560f05df92a39edc6c3d5034faf56b63c Mon Sep 17 00:00:00 2001 From: Jonathon Jongsma Date: Wed, 30 Jan 2008 10:55:12 -0600 Subject: * 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 --- ChangeLog | 7 +++++++ configure.in | 13 ++++++++++--- m4/ax_boost_unit_test_framework.m4 | 3 ++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 913ded5..5fbbf87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-01-30 Jonathon Jongsma + + * 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 * 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" -- cgit v1.2.3