X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=configure.ac;h=6acc96d4e8380ad9070fbcfd9d1685fd944b722b;hb=191cdaf893b48dfc7610b4dbafda7702aa620f1e;hp=62910485efcac2d59fd259e953f8f56d2acdd4e3;hpb=8f3dca312950e5311072e979c273454a2c2b3f35;p=metaproxy-moved-to-github.git diff --git a/configure.ac b/configure.ac index 6291048..6acc96d 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]) @@ -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 \