X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.ac;h=99acb1e4c32e7b70ab8a43d68af3a25c96135934;hb=9c37ed608370ee5d47d5290593bd5a5eeba13594;hp=c65cb4d478e0852d191266c336ac3d42895e0493;hpb=5b556e3b9d95a6e249ffd66d38da5c33f9b00d1d;p=metaproxy-moved-to-github.git diff --git a/configure.ac b/configure.ac index c65cb4d..99acb1e 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ # Autoconf and automake setup AC_PREREQ(2.59) -AC_INIT([metaproxy],[1.0.5], [adam@indexdata.dk]) +AC_INIT([metaproxy],[1.0.6], [adam@indexdata.dk]) AC_CONFIG_HEADERS(src/config.hpp) @@ -76,40 +76,12 @@ BOOST_AUTO_UNIT_TEST( test ) ]) ## YAZPP checks -YAZPP_INIT(threads,1.0) +YAZPP_INIT(threads,1.0.1) if test -z "$YAZPPLIB"; then AC_MSG_ERROR([YAZ++ development libraries missing]) fi YAZ_DOC -## libxslt checks -AC_SUBST(XSLT_LIBS) -AC_SUBST(XSLT_CFLAGS) -xsltdir=default -AC_ARG_WITH(xslt,[[ --with-xslt[=PREFIX] use libxslt in PREFIX]],xsltdir=$withval) -if test "$xsltdir" = "yes" -o "$xsltdir" = "default"; then - for d in /usr /usr/local; do - if test -x $d/bin/xslt-config; then - xsltdir=$d - fi - done -fi -if test "$xsltdir" != "no"; then - AC_MSG_CHECKING(for libXSLT) - if test -x $xsltdir/bin/xslt-config; then - XSLT_LIBS=`$xsltdir/bin/xslt-config --libs` - XSLT_CFLAGS=`$xsltdir/bin/xslt-config --cflags` - XSLT_VER=`$xsltdir/bin/xslt-config --version` - AC_MSG_RESULT($XSLT_VER) - AC_DEFINE([HAVE_XSLT],[1], - [Define to 1 if you have libxslt installed]) - else - AC_MSG_RESULT(Not found) - AC_MSG_ERROR([libxslt required.]) - fi -fi - - # Checks for header files. ##AC_HEADER_STDC ##AC_HEADER_SYS_WAIT @@ -133,11 +105,13 @@ AC_CONFIG_FILES([ Makefile src/Makefile src/Jamfile + xml/Makefile + xml/schema/Makefile + xml/xslt/Makefile doc/Makefile doc/local.ent doc/common/Makefile - doc/common/tkl.xsl doc/common/html.xsl doc/common/man.xsl - doc/common/print.dsl doc/common/html.dsl + doc/common/print.dsl etc/Makefile ]) @@ -146,11 +120,14 @@ AC_OUTPUT # postamble + echo \ "------------------------------------------------------------------------ -Configuration: + Package: ${PACKAGE} + Version: ${VERSION} Source code location: ${srcdir} + CPP Preprocessor: ${CPP} CPP Preprocessor flags: ${CPPFLAGS} CXX Compiler: ${CXX} CXX Compiler flags: ${CXXFLAGS} @@ -159,5 +136,12 @@ Configuration: Host System Type: ${host} Install path: ${prefix} Automake: ${AUTOMAKE} + Archiver: ${AR} + Ranlib: ${RANLIB} + YAZPP Version: ${YAZPPVERSION} + YAZPP Include: ${YAZPPINC} + YAZPP La Lib: ${YAZPPLALIB} + YAZPP Lib: ${YAZPPLIB} + Bugreport: ${PACKAGE_BUGREPORT} ------------------------------------------------------------------------"