Two phase test for libboost-test-dev

[metaproxy-moved-to-github.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b611303..fff4af9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,16 +4,15 @@
 # Autoconf and automake setup
 AC_PREREQ(2.57)
 AC_INIT(yp2, 0.0.1, marc@indexdata.dk)
-AM_CONFIG_HEADER(src/config.hpp)
 
+AC_CONFIG_HEADERS(src/config.hpp)
 
 AC_CONFIG_SRCDIR(configure.ac) 
 AC_CONFIG_AUX_DIR(config)
 AC_CANONICAL_SYSTEM
 ##AC_PREFIX_DEFAULT(`pwd`/install) 
 
-AM_INIT_AUTOMAKE
-
+AM_INIT_AUTOMAKE(1.8)
 
 # Checks for programs.
 AC_PROG_CXX
@@ -28,12 +27,27 @@ AM_PROG_LIBTOOL
 AC_LANG(C++)
 
 # Checks for libraries.
-##AC_CHECK_LIB(ibrary, main)
 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_NOTICE([boost date_time library not found.])
+       AC_MSG_ERROR([Install libboost-date-time-dev (or similar)])
+])
+
+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_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([
@@ -50,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
@@ -95,8 +110,10 @@ fi
 ##AC_HEADER_STDC
 ##AC_HEADER_SYS_WAIT
 ##AC_HEADER_TIME 
-AC_CHECK_HEADERS(iostream list vector stdexcept)
-AC_CHECK_HEADERS(boost/thread/mutex.hpp boost/test/auto_unit_test.hpp)
+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)
 
 # Checks for typedefs, structures, and compiler characteristics.
 ##AC_TYPE_SIZE_T 
@@ -110,6 +127,7 @@ AC_CONFIG_FILES([
         Doxyfile
        Makefile
        src/Makefile
+       src/Jamfile
 ])
 
 AC_OUTPUT