diff options
| author | Jonathon Jongsma <jonathon.jongsma@collabora.co.uk> | 2008-08-13 16:29:31 -0500 |
|---|---|---|
| committer | Jonathon Jongsma <jonathon.jongsma@collabora.co.uk> | 2008-08-13 16:29:31 -0500 |
| commit | 436d8816a9b128441f75ede1109c948038b08aad (patch) | |
| tree | b98d1ee156d10a72521253f1facd25a864ee0c07 | |
| parent | 633cd4486ec59f18a76b68026cd901f9d163567a (diff) | |
Fix boost unit test detection
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 25 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 |
3 files changed, 31 insertions, 4 deletions
@@ -1,5 +1,13 @@ 2008-08-13 Jonathon Jongsma <jjongsma@gnome.org> + * configure.in: fix boost unit test detection (hack stolen from Dodji from + nemiver) + * tests/Makefile.am: explicitly link against the static unit test lib. This + should fix the test build on (at least) Ubuntu Hardy, where previously I was + getting an undefined reference to main() + +2008-08-13 Jonathon Jongsma <jjongsma@gnome.org> + * cairomm/enums.h: update to include new surface types. Remove an unnecessary cairo version check since we depend on a higher version of cairo for other stuff anyway diff --git a/configure.in b/configure.in index 55c7b82..4f2884c 100644 --- a/configure.in +++ b/configure.in @@ -124,9 +124,28 @@ if test x$ENABLE_TESTS = xauto ; then fi if test x$ENABLE_TESTS = xyes ; then -AX_BOOST_BASE([1.33.1]) -AX_BOOST_UNIT_TEST_FRAMEWORK -AC_MSG_NOTICE(support of automated tests enabled) +####################################################### +#boost build system sucks no end. +#it is damn hard to detect the version of boost +#that is installed. All that because our friends of +#the boost project don't want to integrate to autofoo. +#So we resort to hugly hacks to detect the version of +#boost that is installed. +####################################################### + AX_BOOST_BASE([1.33.1]) + AX_BOOST_UNIT_TEST_FRAMEWORK + AX_BOOST_TEST_EXEC_MONITOR + + unit_framework_lib_candidates="/usr/lib/libboost_unit_test_framework-st.a /usr/lib/libboost_unit_test_framework.a" + unit_framework_lib_candidates=$unit_framework_lib_candidates" /usr/lib64/libboost_unit_test_framework-st.a /usr/lib64/libboost_unit_test_framework.a" + for i in $unit_framework_lib_candidates ; do + if test -f $i ; then + BOOST_UNIT_TEST_FRAMEWORK_STATIC_LIB=$i + break + fi + done + AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_STATIC_LIB) + AC_MSG_NOTICE(support of automated tests enabled) else AC_MSG_NOTICE(disabled support of automated tests) fi diff --git a/tests/Makefile.am b/tests/Makefile.am index 366ccfe..7f69eb0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -16,4 +16,4 @@ endif INCLUDES = -I$(top_srcdir) @CAIROMM_CFLAGS@ #The libraries that the executable needs to link against: -LIBS = $(top_builddir)/cairomm/libcairomm-1.0.la @LIBS@ @CAIROMM_LIBS@ @BOOST_UNIT_TEST_FRAMEWORK_LIB@ +LIBS = $(top_builddir)/cairomm/libcairomm-1.0.la @LIBS@ @CAIROMM_LIBS@ @BOOST_UNIT_TEST_FRAMEWORK_STATIC_LIB@ |