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

diff --git a/configure.ac b/configure.ac
index ab22318..b611303 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,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
@@ -32,9 +33,25 @@ 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_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)
@@ -76,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 
@@ -117,18 +132,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