X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=configure.ac;h=b611303df9efabd1a1c08a83d2cd2858e81dcb56;hb=74420da6f0c5cffc13ac62d7d845fade996e7c0f;hp=c74582f807a535d86d2700239d284ae0a2f6c474;hpb=c5ba7efd8dd00b1bdaf657361eb4e7ac54c2f5ea;p=metaproxy-moved-to-github.git

diff --git a/configure.ac b/configure.ac
index c74582f..b611303 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
 ## -*- Autoconf -*-
 ## Process this file with autoconf to produce a configure script.
 
+# Autoconf and automake setup
 AC_PREREQ(2.57)
 AC_INIT(yp2, 0.0.1, marc@indexdata.dk)
 AM_CONFIG_HEADER(src/config.hpp)
@@ -16,6 +17,7 @@ AM_INIT_AUTOMAKE
 
 # Checks for programs.
 AC_PROG_CXX
+AC_PROG_CXXCPP
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
@@ -27,7 +29,29 @@ AC_LANG(C++)
 
 # Checks for libraries.
 ##AC_CHECK_LIB(ibrary, main)
-AC_CHECK_LIB(boost_thread, main)
+AC_CHECK_LIB(boost_thread, main, [],[
+	AC_MSG_ERROR([boost thread library not found. Install libboost-thread-dev (or similar)])
+])
+
+AC_MSG_CHECKING([for boost_unit_test_framework presence])
+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_CHECK(true);
+}
+],[],
+[
+	AC_MSG_RESULT([yes])
+	LIBS=$OLIBS
+],
+[
+	AC_MSG_RESULT([no])
+	AC_MSG_ERROR([Install libboost-test-dev (or similar)])
+])
 
 ## YAZPP checks
 YAZPP_INIT(threads,1.0)
@@ -69,12 +93,10 @@ fi
 
 # Checks for header files.
 ##AC_HEADER_STDC
-##AC_HEADER_STDCXX
 ##AC_HEADER_SYS_WAIT
 ##AC_HEADER_TIME 
-AC_CHECK_HEADERS(boost/thread/mutex.hpp)
-
-
+AC_CHECK_HEADERS(iostream list vector stdexcept)
+AC_CHECK_HEADERS(boost/thread/mutex.hpp boost/test/auto_unit_test.hpp)
 
 # Checks for typedefs, structures, and compiler characteristics.
 ##AC_TYPE_SIZE_T 
@@ -107,5 +129,6 @@ Configuration:
   Linked libs:                ${LIBS}
   Host System Type:           ${host}
   Install path:               ${prefix}
+  Automake:                   ${AUTOMAKE}
 
 ------------------------------------------------------------------------"