X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.ac;h=9d5223d9615d63950a2b1b5eebdecbc2da1f8cee;hb=872baf038ffe10f670ba45082c6911201e2ac4cb;hp=aa902a32be66b21a619ca681c2a0a64095117595;hpb=ca7dca71d8eb39eec77a782c649d4b122151b455;p=metaproxy-moved-to-github.git

diff --git a/configure.ac b/configure.ac
index aa902a3..9d5223d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,17 +3,16 @@
 
 # Autoconf and automake setup
 AC_PREREQ(2.57)
-AC_INIT(yp2, 0.0.1, marc@indexdata.dk)
-AM_CONFIG_HEADER(src/config.hpp)
+AC_INIT(yp2, 0.0.3, adam@indexdata.dk)
 
+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
@@ -27,19 +26,46 @@ 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(ibrary, main)
+AC_CHECK_LIB(dl,dlopen)
+
 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_program_options, main, [],[
+	AC_MSG_NOTICE([boost program options library not found.])
+	AC_MSG_ERROR([Install libboost-program-options-dev (or similar)])
+])
+
+AC_CHECK_LIB(boost_regex, main, [],[
+	AC_MSG_NOTICE([boost regex library not found.])
+	AC_MSG_ERROR([Install libboost-regex-dev (or similar)])
 ])
 
-AC_MSG_CHECKING([for boost_unit_test_framework presence])
+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);
 }
@@ -50,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
@@ -83,10 +110,7 @@ if test "$xsltdir" != "no"; then
                 [Define to 1 if you have libxslt installed])
 	else
 		AC_MSG_RESULT(Not found)
-                if test "$xsltdir" = "default"; then
-                        AC_MSG_WARN([Libxslt development libraries not found.])
-                else
-                        AC_MSG_ERROR([libxslt development libraries not found.])                fi
+		AC_MSG_ERROR([libxslt required.])
 	fi
 fi
 
@@ -95,8 +119,11 @@ 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/regex.hpp \
+                 boost/test/auto_unit_test.hpp)
 
 # Checks for typedefs, structures, and compiler characteristics.
 ##AC_TYPE_SIZE_T 
@@ -110,6 +137,7 @@ AC_CONFIG_FILES([
         Doxyfile
 	Makefile
 	src/Makefile
+	src/Jamfile
 ])
 
 AC_OUTPUT
@@ -132,18 +160,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
-
-"
-