X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=configure.ac;h=5cb6340543ed7a52f399e59f3707167c9fe824a8;hb=fbd550a4d263e71607b13109ad8f7d92dfcbc741;hp=15b8d2ef6fde1ff9e743b111243120db8bc65d3c;hpb=2083d358367a2c0ebc29bfad195acd5296de5c00;p=metaproxy-moved-to-github.git

diff --git a/configure.ac b/configure.ac
index 15b8d2e..5cb6340 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,9 @@
 
 # Autoconf and automake setup
 AC_PREREQ([2.60])
-AC_INIT([metaproxy],[1.2.6],[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,20 +38,35 @@ 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 <yaz/yaz-version.h>]],
+                         [[
+#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],[1.33])
+ID_BOOST([thread test regex],[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
+if test -z "${BOOST_REGEX_LIB}"; then
+    AC_MSG_ERROR([Boost regex development libraries required])
+fi
 
 xml_avail=false
 xslt_avail=false
@@ -74,7 +91,7 @@ else
 fi
 AC_DEFINE_UNQUOTED([VERSION_SHA1], "$SHA1", [SHA-1 from Git])
 
-AC_CONFIG_FILES([
+AC_OUTPUT([
 	metaproxy-config
         Doxyfile
 	Makefile
@@ -93,12 +110,6 @@ AC_CONFIG_FILES([
 
 ])
 
-AC_OUTPUT
-
-
-# postamble
-
-
 echo \
 "------------------------------------------------------------------------