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

diff --git a/configure.ac b/configure.ac
index d42d7db..8f44b2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,16 +40,16 @@ AC_CHECK_FUNCS([localtime_r])
 USEMARCON_INIT
 
 ## YAZPP checks
-YAZPP_INIT([threads],[1.2.7])
+YAZPP_INIT([threads],[1.6.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.28 or later])
+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 < 0x40216
+#if YAZ_VERSIONL < 0x50700
 #error too old
 #endif
 ]])],
@@ -59,7 +59,7 @@ AC_COMPILE_IFELSE(
 )
 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
@@ -70,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])
 
@@ -103,13 +94,14 @@ AC_OUTPUT([
 	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
 ])
 
 echo \