X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=configure.ac;h=fff4af90ae1de3b07c7578fd1bd001d305723232;hb=d1ce2ce9cea30327cd7a5831daa43a7b8eacabd3;hp=df7d976e4952ca3e6412b591e028a99d88c8c97e;hpb=b3900a2211d79632916c61a78ee6f0ce39ae9965;p=metaproxy-moved-to-github.git

diff --git a/configure.ac b/configure.ac
index df7d976..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
@@ -104,7 +110,7 @@ fi
 ##AC_HEADER_STDC
 ##AC_HEADER_SYS_WAIT
 ##AC_HEADER_TIME 
-AC_CHECK_HEADERS(iostream list vector stdexcept)
+AC_CHECK_HEADERS(sys/select.h sys/socket.h iostream list vector stdexcept)
 AC_CHECK_HEADERS(boost/thread/mutex.hpp \ 
                  boost/date_time/posix_time/posix_time.hpp \
                  boost/test/auto_unit_test.hpp)