X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=configure.ac;h=5cb6340543ed7a52f399e59f3707167c9fe824a8;hb=901f5dac26098062f04ae8e647e06880e526abe9;hp=5bed507533316ffb5fbadcedbc0ffc82ed2e9ff1;hpb=0bf2433a3002efb03f3d894cb4f2c694fbf4359b;p=metaproxy-moved-to-github.git diff --git a/configure.ac b/configure.ac index 5bed507..5cb6340 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,9 @@ # Autoconf and automake setup AC_PREREQ([2.60]) -AC_INIT([metaproxy],[1.3.1],[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]) @@ -36,12 +38,24 @@ AC_CHECK_LIB([m],[main]) AC_CHECK_FUNCS([localtime_r]) ## YAZPP checks -YAZPP_INIT([threads],[1.2.6]) +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.22 or later]) +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[#include ]], + [[ +#if YAZ_VERSIONL < 0x40216 +#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 \ "------------------------------------------------------------------------