# Autoconf and automake setup
AC_PREREQ(2.59)
-AC_INIT([metaproxy],[1.0.7],[metaproxy-help@indexdata.dk])
+AC_INIT([metaproxy],[1.0.9],[metaproxy-help@indexdata.dk])
AC_CONFIG_HEADERS(src/config.hpp)
# Checks for libraries.
AC_CHECK_LIB(dl,dlopen)
-boostdir="yes"
-AC_ARG_WITH(boost, [ ---with-boost=PREFIX Boost library in PREFIX],[boostdir=$withval])
-if test "$openssl" != "yes"; then
- CPPFLAGS="-I${boostdir}/include"
- LIBS="-L${boostdir}/lib"
-fi
-
-AC_CHECK_LIB(pthread, main)
-
-AC_CHECK_LIB(boost_thread, main, [],[
- AC_MSG_NOTICE([boost thread library not found.])
- AC_MSG_ERROR([Install libboost-thread-dev (or similar)])
-])
+# 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)
-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)])
-])
+LD_FLAGS="$LD_FLAGS $BOOST_LDFLAGS"
+#AM_LDLFAGS="$AM_LDLFAGS\
+LIBS="$LIBS\
+$BOOST_DATE_TIME_LIB $BOOST_PROGRAM_OPTIONS_LIB $BOOST_THREAD_LIB";
-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_UNIT_TEST( test )
-{
- BOOST_CHECK(true);
-}
-],[],
-[
- AC_MSG_RESULT([yes])
- LIBS=$OLIBS
-],
-[
- AC_MSG_RESULT([no])
- AC_MSG_NOTICE([Boost unit test framework does not appear to work])
- AC_MSG_ERROR([Consult config.log for details])
-])
+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])
+fi
+if test "$ax_cv_boost_thread" = "no"; then
+ 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])
+fi
+
## YAZPP checks
-YAZPP_INIT(threads,1.0.1)
+YAZPP_INIT(threads,1.0.2)
if test -z "$YAZPPLIB"; then
AC_MSG_ERROR([YAZ++ development libraries missing])
fi
##AC_HEADER_SYS_WAIT
##AC_HEADER_TIME
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