From: Adam Dickmeiss Date: Wed, 27 Mar 2013 10:28:38 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy X-Git-Tag: v1.3.54~3 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=9b935138134a914fcc2d773112733e3c6448dc1d;hp=a9a8c8f599d32df565d91542d0938400c681c41f;p=metaproxy-moved-to-github.git Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy --- diff --git a/configure.ac b/configure.ac index 6291048..09008fb 100644 --- a/configure.ac +++ b/configure.ac @@ -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])