X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=configure.ac;h=e9a3a2190eecf2a31c229edf5658d753948f37cc;hb=8ced8e7b5de3ecba12ac68ce5c5e8cddf40d800f;hp=6546e1aa51c8d01720bc6f1a4abb88b7db4d72c1;hpb=2f438a597d89f68ee36a06240ca94de383083edc;p=metaproxy-moved-to-github.git diff --git a/configure.ac b/configure.ac index 6546e1a..e9a3a21 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,9 @@ # Autoconf and automake setup AC_PREREQ([2.60]) -AC_INIT([metaproxy],[1.3.14],[metaproxy-help@indexdata.dk]) +AC_INIT([metaproxy], +m4_esyscmd([. ./IDMETA; echo $VERSION|tr -d '\n']), +[metaproxy-help@indexdata.dk]) AC_CONFIG_HEADERS([src/config.hpp]) @@ -35,17 +37,19 @@ AC_CHECK_LIB([m],[main]) AC_CHECK_FUNCS([localtime_r]) +USEMARCON_INIT + ## YAZPP checks -YAZPP_INIT([threads],[1.2.7]) +YAZPP_INIT([threads],[1.4.0]) if test -z "$YAZPPLIB"; then AC_MSG_ERROR([YAZ++ development libraries missing]) fi CPPFLAGS="$YAZPPINC $CPPFLAGS" -AC_MSG_CHECKING([if YAZ is version 4.2.14 or later]) +AC_MSG_CHECKING([if YAZ is version 4.2.44 or later]) AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include ]], [[ -#if YAZ_VERSIONL < 0x4020e +#if YAZ_VERSIONL < 0x4022C #error too old #endif ]])], @@ -89,7 +93,7 @@ else fi AC_DEFINE_UNQUOTED([VERSION_SHA1], "$SHA1", [SHA-1 from Git]) -AC_CONFIG_FILES([ +AC_OUTPUT([ metaproxy-config Doxyfile Makefile @@ -108,12 +112,6 @@ AC_CONFIG_FILES([ ]) -AC_OUTPUT - - -# postamble - - echo \ "------------------------------------------------------------------------