From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 2 Dec 2005 11:04:56 +0000 (+0000)
Subject: Two phase test for libboost-test-dev
X-Git-Tag: YP2.0.0.2~136
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;ds=sidebyside;h=d1ce2ce9cea30327cd7a5831daa43a7b8eacabd3;p=metaproxy-moved-to-github.git

Two phase test for libboost-test-dev
---

diff --git a/configure.ac b/configure.ac
index b4bf3b4..fff4af9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,7 +42,12 @@ 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([
@@ -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