X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.ac;h=8f44b2b6e7d4e8e15978471a7bf143cbcb6625f8;hb=586d78659d671683f33ec55f4a7d32b28e345ccd;hp=633e169174f40447da6795d2522e5afd03687b06;hpb=bd2f40fe6690ff236d0a5e144ff8982a63052ac2;p=metaproxy-moved-to-github.git

diff --git a/configure.ac b/configure.ac
index 633e169..8f44b2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,9 @@
 
 # Autoconf and automake setup
 AC_PREREQ([2.60])
-AC_INIT([metaproxy],[1.3.3],[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,15 +37,29 @@ AC_CHECK_LIB([m],[main])
 
 AC_CHECK_FUNCS([localtime_r])
 
+USEMARCON_INIT
+
 ## YAZPP checks
-YAZPP_INIT([threads],[1.2.6])
+YAZPP_INIT([threads],[1.6.0])
 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 5.7.0 or later])
+AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM([[#include <yaz/yaz-version.h>]],
+                         [[
+#if YAZ_VERSIONL < 0x50700
+#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])
+ID_BOOST([system thread test regex],[1.33])
 if test -z "${BOOST_THREAD_LIB}"; then
     AC_MSG_ERROR([Boost thread development libraries required])
 fi
@@ -54,19 +70,10 @@ if test -z "${BOOST_REGEX_LIB}"; then
     AC_MSG_ERROR([Boost regex development libraries required])
 fi
 
-xml_avail=false
-xslt_avail=false
-YAZ_LIBXML2([xml_avail=true])
-if $xml_avail; then
-    YAZ_LIBXSLT([xslt_avail=true])
-else
-    AC_MSG_ERROR([Libxml2 development files not found])
-fi
-if $xslt_avail; then
-    :
-else
-    AC_MSG_ERROR([Libxslt development files not found])
-fi
+case $YAZPPINC in
+  *YAZ_HAVE_XSLT=1*) ;;
+  *) AC_MSG_ERROR([YAZ not compiled with Libxslt support]) ;;
+esac
 
 AC_CHECK_HEADERS([sys/select.h sys/socket.h])
 
@@ -77,7 +84,7 @@ else
 fi
 AC_DEFINE_UNQUOTED([VERSION_SHA1], "$SHA1", [SHA-1 from Git])
 
-AC_CONFIG_FILES([
+AC_OUTPUT([
 	metaproxy-config
         Doxyfile
 	Makefile
@@ -87,21 +94,16 @@ AC_CONFIG_FILES([
 	xml/schema/Makefile
 	xml/xslt/Makefile
 	doc/Makefile
-	doc/local.ent
-        doc/common/Makefile
+	doc/local0.ent
+	doc/common/Makefile
 	doc/common/print.dsl
 	etc/Makefile
 ],[
         sed s%echo_source=yes%echo_source=no%g < metaproxy-config > src/metaproxy-config && chmod +x metaproxy-config src/metaproxy-config
-
+	diff doc/local.ent doc/local0.ent >/dev/null 2>/dev/null \
+		|| cp doc/local0.ent doc/local.ent
 ])
 
-AC_OUTPUT
-
-
-# postamble
-
-
 echo \
 "------------------------------------------------------------------------