X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.ac;h=65207eff5a2f040d83863a271f687bfbbdf75356;hb=1e118509f32cacf688acc277c59cdb97d1048f04;hp=2167645c001c7084c5004547b7c7515a65b8daa2;hpb=0f7ed8f2edaea1f75d608612e49703f6cc25e1dc;p=metaproxy-moved-to-github.git

diff --git a/configure.ac b/configure.ac
index 2167645..65207ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@
 ## 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.13],[metaproxy-help@indexdata.dk])
 
 AC_CONFIG_HEADERS(src/config.hpp)
 
@@ -12,7 +12,7 @@ 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
@@ -23,66 +23,54 @@ AC_PROG_MAKE_SET
 AC_PROG_RANLIB
 AM_PROG_LIBTOOL
 
-# Use C++ compilers only for tests
-AC_LANG(C++)
+# Default language to use for tests (some tests may switch to C++)
+AC_LANG(C)
 
 if test "$enable_shared" = "yes"; then
-   	AC_DEFINE([HAVE_DL_SUPPORT],[1],
-                [Define to 1 if you have shared module support])
+    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(m,main)
 
+AC_CHECK_FUNCS([localtime_r])
+
+## YAZPP checks
+YAZPP_INIT([threads],[1.1.0])
+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_BASE(1.33)
-AX_BOOST_DATE_TIME(1.33)
-AX_BOOST_PROGRAM_OPTIONS(1.33)
-AX_BOOST_THREAD(1.33)
-AX_BOOST_UNIT_TEST_FRAMEWORK(1.33)
+
+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])
-else
-   LIBS="$LIBS -lboost_date_time";
-fi
-if test "$ax_cv_boost_program_options" = "no"; then
-   AC_MSG_ERROR([install libboost-program-options-dev or similar])
-else
-   LIBS="$LIBS -lboost_program_options";
+    AC_MSG_ERROR([install libboost-dev or similar])
 fi
 if test "$ax_cv_boost_thread" = "no"; then
-   AC_MSG_ERROR([install libboost-thread-dev or similar])
-else
-   LIBS="$LIBS -lboost_thread";
+    AC_MSG_ERROR([install libboost-thread-dev or similar])
 fi
 if test "$ax_cv_boost_unit_test_framework" = "no"; then
-   AC_MSG_ERROR([install libboost-test-dev or similar])
+    AC_MSG_ERROR([install libboost-test-dev or similar])
 fi
     
 
-## YAZPP checks
-YAZPP_INIT(threads,1.0.2)
-if test -z "$YAZPPLIB"; then
-	AC_MSG_ERROR([YAZ++ development libraries missing])
-fi
-YAZ_DOC
 
 # Checks for header files.
 ##AC_HEADER_STDC
 ##AC_HEADER_SYS_WAIT
 ##AC_HEADER_TIME 
-AC_CHECK_HEADERS(sys/select.h sys/socket.h iostream list vector stdexcept)
+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_CONFIG_FILES([
@@ -123,6 +111,10 @@ echo \
   Automake:                   ${AUTOMAKE}
   Archiver:                   ${AR}
   Ranlib:                     ${RANLIB}
+  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}               
   YAZPP Version:              ${YAZPPVERSION}
   YAZPP Include:              ${YAZPPINC}
   YAZPP La Lib:               ${YAZPPLALIB}
@@ -130,3 +122,8 @@ echo \
   Bugreport:                  ${PACKAGE_BUGREPORT}
 
 ------------------------------------------------------------------------"
+dnl Local Variables:
+dnl mode:shell-script
+dnl sh-indentation: 2
+dnl sh-basic-offset: 4
+dnl End: