X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=configure.ac;h=2e5b338f9b6b023f32ecbad139ab7ffa053c12d3;hb=4f0df3c865b234819a564217e3dc07e8e468ab23;hp=182ba79d5a0b69f9c60bbe3b1a35447e3c5a335b;hpb=47c9a640a773d57235bd27ab271c113630fa8816;p=metaproxy-moved-to-github.git diff --git a/configure.ac b/configure.ac index 182ba79..2e5b338 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.60) -AC_INIT([metaproxy],[1.0.13],[metaproxy-help@indexdata.dk]) +AC_PREREQ([2.60]) +AC_INIT([metaproxy],[1.0.13.1],[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.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,8 +30,8 @@ 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]) @@ -45,22 +43,15 @@ fi YAZ_DOC CPPFLAGS="$YAZPPINC $CPPFLAGS" -# check for Boost C++ development libs and headers - -ID_BOOST([thread test], [1.33]) - -# 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) +ID_BOOST([thread test],[1.33]) +if test -z "${BOOST_THREAD_LIB}"; then + AC_MSG_ERROR([Boost thread development libraries required]) +fi +if test -z "${BOOST_TEST_LIB}"; then + AC_MSG_ERROR([Boost unit test framework libraries required]) +fi -# Checks for library functions. +AC_CHECK_HEADERS([sys/select.h sys/socket.h]) AC_CONFIG_FILES([ Doxyfile