X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=configure.ac;h=d647aa88f7ab111082e8fa57611f9a6383bd521f;hb=8090a550770dd7da5d1ef7c7ff2b301902694629;hp=e4c8aa2e750133daf2545ba07bf7d1a51032e024;hpb=08f12eea6b5ee84728db1f3571b4be21e891cb12;p=metaproxy-moved-to-github.git diff --git a/configure.ac b/configure.ac index e4c8aa2..d647aa8 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,9 @@ # Autoconf and automake setup AC_PREREQ([2.60]) -AC_INIT([metaproxy],[1.3.8],[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]) @@ -40,8 +42,20 @@ YAZPP_INIT([threads],[1.2.7]) if test -z "$YAZPPLIB"; then AC_MSG_ERROR([YAZ++ development libraries missing]) fi -YAZ_DOC CPPFLAGS="$YAZPPINC $CPPFLAGS" +AC_MSG_CHECKING([if YAZ is version 4.2.14 or later]) +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[#include ]], + [[ +#if YAZ_VERSIONL < 0x4020e +#error too old +#endif +]])], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([newer version of YAZ required])] +) +YAZ_DOC ID_BOOST([thread test regex],[1.33]) if test -z "${BOOST_THREAD_LIB}"; then @@ -77,7 +91,7 @@ else fi AC_DEFINE_UNQUOTED([VERSION_SHA1], "$SHA1", [SHA-1 from Git]) -AC_CONFIG_FILES([ +AC_OUTPUT([ metaproxy-config Doxyfile Makefile @@ -96,12 +110,6 @@ AC_CONFIG_FILES([ ]) -AC_OUTPUT - - -# postamble - - echo \ "------------------------------------------------------------------------