X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=configure.ac;h=b4bf3b4e6b795fc90a006405f0bcfbc3d929bede;hb=2bdc3f5c9e2f2faa8c8ef0da63c19493dd6a58ed;hp=f89fea87ee9aed57202b56429aa114dd67375fba;hpb=bbb3d4f980ac7e783ef4c9ea5be4eb1107af7ec4;p=metaproxy-moved-to-github.git

diff --git a/configure.ac b/configure.ac
index f89fea8..b4bf3b4 100644
--- 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,14 +27,40 @@ 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_unit_test_framework, [], [],[
-## 	AC_MSG_ERROR([boost unit test library not found. Install libboost-test-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])
+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)
@@ -79,10 +104,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 
@@ -96,6 +121,7 @@ AC_CONFIG_FILES([
         Doxyfile
 	Makefile
 	src/Makefile
+	src/Jamfile
 ])
 
 AC_OUTPUT
@@ -118,18 +144,3 @@ Configuration:
   Automake:                   ${AUTOMAKE}
 
 ------------------------------------------------------------------------"
-
-automake --version| grep 1.4  > /dev/null ||  \
-automake --version| grep 1.5  > /dev/null ||  \
-automake --version| grep 1.6  > /dev/null ||  \
-automake --version| grep 1.7  > /dev/null ||  \ 
-automake --version| grep 1.8  > /dev/null     \ 
-&& echo \
-"  YOUR AUTOMAKE IS TOO OLD - USE VERSION 1.9 OR NEWER
-
-  On a Debian system run
-
-  sudo apt-get install automake1.9
-  sudo update-alternatives --config automake
-
-"
\ No newline at end of file