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

diff --git a/configure.ac b/configure.ac
index cefe52f..fff4af9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,14 +28,26 @@ AC_LANG(C++)
 
 # Checks for libraries.
 AC_CHECK_LIB(boost_thread, main, [],[
-	AC_MSG_ERROR([boost thread library not found. Install libboost-thread-dev (or similar)])
+	AC_MSG_NOTICE([boost thread library not found.])
+	AC_MSG_ERROR([Install libboost-thread-dev (or similar)])
 ])
 
 AC_CHECK_LIB(boost_date_time, main, [],[
-	AC_MSG_ERROR([boost date_time library not found. Install libboost-date-time-dev (or similar)])
+	AC_MSG_NOTICE([boost date_time library not found.])
+	AC_MSG_ERROR([Install libboost-date-time-dev (or similar)])
 ])
 
-AC_MSG_CHECKING([for boost_unit_test_framework presence])
+AC_CHECK_LIB(boost_program_options, main, [],[
+	AC_MSG_NOTICE([boost program options library not found.])
+	AC_MSG_ERROR([Install libboost-program-options-dev (or similar)])
+])
+
+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([
@@ -52,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
@@ -97,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)
@@ -114,6 +127,7 @@ AC_CONFIG_FILES([
         Doxyfile
 	Makefile
 	src/Makefile
+	src/Jamfile
 ])
 
 AC_OUTPUT