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

diff --git a/configure.ac b/configure.ac
index 50e8a78..cefe52f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,21 +1,22 @@
 ## -*- 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)
 
+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
+AC_PROG_CXXCPP
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
@@ -26,14 +27,33 @@ 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_CHECK_LIB(boost_unit_test_framework, [], [],[
-## 	AC_MSG_ERROR([boost unit test library not found. Install libboost-test-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_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)
@@ -75,12 +95,12 @@ 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/date_time/posix_time/posix_time.hpp \
+                 boost/test/auto_unit_test.hpp)
 
 # Checks for typedefs, structures, and compiler characteristics.
 ##AC_TYPE_SIZE_T 
@@ -113,5 +133,6 @@ Configuration:
   Linked libs:                ${LIBS}
   Host System Type:           ${host}
   Install path:               ${prefix}
+  Automake:                   ${AUTOMAKE}
 
 ------------------------------------------------------------------------"