X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=5a889f9e23ea22014c33b8267963eaa752d42f47;hb=faf9cf4cf32efade578b5b122f09df0818baeae2;hp=a0188a2e737fc8010501c0f091547a227d7a91d5;hpb=d15eeaaabd7e3f92ffe0215bd930bbc92b380e0f;p=metaproxy-moved-to-github.git

diff --git a/configure.ac b/configure.ac
index a0188a2..5a889f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,19 +2,17 @@
 ## Process this file with autoconf to produce a configure script.
 
 # Autoconf and automake setup
-AC_PREREQ(2.59)
-AC_INIT([metaproxy],[1.0.9],[metaproxy-help@indexdata.dk])
+AC_PREREQ([2.60])
+AC_INIT([metaproxy],[1.0.20],[metaproxy-help@indexdata.dk])
 
-AC_CONFIG_HEADERS(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([1.8])
+AM_INIT_AUTOMAKE([1.9])
 
-# Checks for programs.
 AC_PROG_CXX
 AC_PROG_CXXCPP
 AC_PROG_INSTALL
@@ -24,7 +22,7 @@ AC_PROG_RANLIB
 AM_PROG_LIBTOOL
 
 # Default language to use for tests (some tests may switch to C++)
-AC_LANG(C)
+AC_LANG([C])
 
 if test "$enable_shared" = "yes"; then
     AC_DEFINE([HAVE_DL_SUPPORT],[1],
@@ -32,56 +30,33 @@ if test "$enable_shared" = "yes"; then
 fi
 
 # Checks for libraries.
-AC_CHECK_LIB(dl,dlopen)
-AC_CHECK_LIB(m,main)
+AC_CHECK_LIB([dl],[dlopen])
+AC_CHECK_LIB([m],[main])
+
+AC_CHECK_FUNCS([localtime_r])
 
 ## YAZPP checks
-YAZPP_INIT(threads,1.0.3)
+YAZPP_INIT([threads],[1.1.4])
 if test -z "$YAZPPLIB"; then
     AC_MSG_ERROR([YAZ++ development libraries missing])
 fi
 YAZ_DOC
 CPPFLAGS="$YAZPPINC $CPPFLAGS"
 
-# check for Boost C++ development libs and headers
-
-AX_BOOST([1.32])
-if test "$ax_cv_boost_base" = "no"; then
-    AC_MSG_ERROR([install libboost-dev or similar])
-fi
-if test "$ax_cv_boost_date_time" = "no"; then
-    AC_MSG_ERROR([install libboost-date-time-dev or similar])
-fi
-if test "$ax_cv_boost_program_options" = "no"; then
-    AC_MSG_ERROR([install libboost-program-options-dev or similar])
+ID_BOOST([thread test],[1.33])
+if test -z "${BOOST_THREAD_LIB}"; then
+    AC_MSG_ERROR([Boost thread development libraries required])
 fi
-if test "$ax_cv_boost_thread" = "no"; then
-    AC_MSG_ERROR([install libboost-thread-dev or similar])
+if test -z "${BOOST_TEST_LIB}"; then
+    AC_MSG_ERROR([Boost unit test framework libraries required])
 fi
-if test "$ax_cv_boost_unit_test_framework" = "no"; then
-    AC_MSG_ERROR([install libboost-test-dev or similar])
-fi
-    
-
-
-# Checks for header files.
-##AC_HEADER_STDC
-##AC_HEADER_SYS_WAIT
-##AC_HEADER_TIME 
-AC_CHECK_HEADERS(sys/select.h sys/socket.h)
-
-# Checks for typedefs, structures, and compiler characteristics.
-##AC_TYPE_SIZE_T 
-##AC_CHECK_SIZEOF(int)
-##AC_CHECK_SIZEOF(long int)
 
-# Checks for library functions.
+AC_CHECK_HEADERS([sys/select.h sys/socket.h])
 
 AC_CONFIG_FILES([
         Doxyfile
 	Makefile
 	src/Makefile
-	src/Jamfile
 	xml/Makefile
 	xml/schema/Makefile
 	xml/xslt/Makefile
@@ -118,7 +93,7 @@ echo \
   Boost Version:              ${BOOST_VERSION}               
   Boost Include:              ${BOOST_CPPFLAGS}               
   Boost linker flags:         ${BOOST_LDFLAGS}               
-  Boost Libs:                 ${BOOST_DATE_TIME_LIB} ${BOOST_PROGRAM_OPTIONS_LIB} ${BOOST_THREAD_LIB}               
+  Boost Libs:                 ${BOOST_DATE_TIME_LIB} ${BOOST_THREAD_LIB}               
   YAZPP Version:              ${YAZPPVERSION}
   YAZPP Include:              ${YAZPPINC}
   YAZPP La Lib:               ${YAZPPLALIB}