X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=configure.ac;h=83c30ecd6a4836ca4ec6792c882b692c1a11497b;hb=f47e8cf4cde2ba5465106e219c803e6424a4f177;hp=df7d976e4952ca3e6412b591e028a99d88c8c97e;hpb=b3900a2211d79632916c61a78ee6f0ce39ae9965;p=metaproxy-moved-to-github.git

diff --git a/configure.ac b/configure.ac
index df7d976..83c30ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 # Autoconf and automake setup
 AC_PREREQ(2.57)
-AC_INIT(yp2, 0.0.1, marc@indexdata.dk)
+AC_INIT(yp2, 0.0.2, adam@indexdata.dk)
 
 AC_CONFIG_HEADERS(src/config.hpp)
 
@@ -26,7 +26,14 @@ AM_PROG_LIBTOOL
 # Use C++ compilers only for tests
 AC_LANG(C++)
 
+if test "$enable_shared" = "yes"; then
+   	AC_DEFINE([HAVE_DL_SUPPORT],[1],
+                [Define to 1 if you have shared module support])
+fi
+
 # Checks for libraries.
+AC_CHECK_LIB(dl,dlopen)
+
 AC_CHECK_LIB(boost_thread, main, [],[
 	AC_MSG_NOTICE([boost thread library not found.])
 	AC_MSG_ERROR([Install libboost-thread-dev (or similar)])
@@ -42,13 +49,23 @@ AC_CHECK_LIB(boost_program_options, main, [],[
 	AC_MSG_ERROR([Install libboost-program-options-dev (or similar)])
 ])
 
-AC_MSG_CHECKING([for boost_unit_test_framework presence])
+AC_CHECK_LIB(boost_regex, main, [],[
+	AC_MSG_NOTICE([boost regex library not found.])
+	AC_MSG_ERROR([Install libboost-regex-dev (or similar)])
+])
+
+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([
 #define BOOST_AUTO_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp> 
-BOOST_AUTO_TEST_CASE( test )
+BOOST_AUTO_UNIT_TEST( test )
 {
  BOOST_CHECK(true);
 }
@@ -59,7 +76,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
@@ -104,9 +122,10 @@ fi
 ##AC_HEADER_STDC
 ##AC_HEADER_SYS_WAIT
 ##AC_HEADER_TIME 
-AC_CHECK_HEADERS(iostream list vector stdexcept)
+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/regex.hpp \
                  boost/test/auto_unit_test.hpp)
 
 # Checks for typedefs, structures, and compiler characteristics.