X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=configure.ac;h=01a82aa17d601c5f8a075ba47691b9c9f2415d2f;hb=5e2daf376ef4adc403cf9c962bfeb2669741cacb;hp=b4bf3b4e6b795fc90a006405f0bcfbc3d929bede;hpb=2bdc3f5c9e2f2faa8c8ef0da63c19493dd6a58ed;p=metaproxy-moved-to-github.git

diff --git a/configure.ac b/configure.ac
index b4bf3b4..01a82aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,13 +42,18 @@ AC_CHECK_LIB(boost_program_options, main, [],[
 	AC_MSG_ERROR([Install libboost-program-options-dev (or similar)])
 ])
 
-AC_MSG_CHECKING([for boost_unit_test_framework presence])
+AC_CHECK_HEADER(boost/test/auto_unit_test.hpp,,[
+	AC_MSG_NOTICE([boost test unit header not found.])
+	AC_MSG_ERROR([Install libboost-test-dev (or similar)])
+])
+
+AC_MSG_CHECKING([whether boost_unit_test_framework works])
 OLIBS=$LIBS
 LIBS="$LIBS -lboost_unit_test_framework"
 AC_TRY_LINK([
 #define BOOST_AUTO_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp> 
-BOOST_AUTO_TEST_CASE( test )
+BOOST_AUTO_UNIT_TEST( test )
 {
  BOOST_CHECK(true);
 }
@@ -59,7 +64,8 @@ BOOST_AUTO_TEST_CASE( test )
 ],
 [
 	AC_MSG_RESULT([no])
-	AC_MSG_ERROR([Install libboost-test-dev (or similar)])
+	AC_MSG_NOTICE([Boost unit test framework does not appear to work])
+	AC_MSG_ERROR([Consult config.log for details])
 ])
 
 ## YAZPP checks