X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=bb7422549caba1491cb8f52af5302ab8d580e9d2;hp=a46be3f05d477b7f5bc821501cdbede634589961;hb=a7367e8dacfc22acf7e6f24e47d29961ccc0b95d;hpb=fd0487592e7aa2d59bfb8053eea115c50285410d diff --git a/configure.ac b/configure.ac index a46be3f..bb74225 100644 --- a/configure.ac +++ b/configure.ac @@ -1,20 +1,18 @@ -dnl yazproxy, Index Data 1994-2006 +dnl This file is part of YAZ proxy dnl See the file LICENSE for details. -dnl $Id: configure.ac,v 1.9 2006-05-26 19:57:35 adam Exp $ -AC_PREREQ(2.59) -AC_INIT([yazproxy],[1.2.1],[adam@indexdata.dk]) +AC_PREREQ(2.60) +AC_INIT([yazproxy],[1.3.6],[adam@indexdata.dk]) AC_CONFIG_SRCDIR(configure.ac) AC_CONFIG_AUX_DIR([config]) -AM_INIT_AUTOMAKE([1.8]) +AM_INIT_AUTOMAKE([1.9]) AC_PROG_CC AC_PROG_CPP AC_PROG_CXX AC_HEADER_STDC -AM_DISABLE_SHARED AM_PROG_LIBTOOL -YAZPP_INIT(threads,1.0) +YAZPP_INIT([threads],[1.1.4]) if test -z "$YAZPPLIB"; then AC_MSG_ERROR([YAZ++ development libraries missing]) fi @@ -22,38 +20,9 @@ YAZ_DOC USEMARCON_INIT AC_CHECK_FUNCS(setrlimit getrlimit gettimeofday) -AC_CHECK_HEADERS(pwd.h sys/resource.h sys/stat.h sys/time.h sys/types.h sys/wait.h unistd.h) +AC_CHECK_HEADERS(sys/resource.h sys/stat.h sys/time.h sys/types.h unistd.h) AC_CHECK_LIB(dl,dlopen) dnl -dnl ----- libXSLT -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) - else - AC_MSG_RESULT(Not found) - if test "$xsltdir" = "default"; then - AC_MSG_WARN([Libxslt development libraries not found.]) - else - AC_MSG_ERROR([libxslt development libraries not found.]) fi - fi -fi - AC_SUBST(YAZPROXY_SRC_ROOT) AC_SUBST(YAZPROXY_BUILD_ROOT) YAZPROXY_SRC_ROOT=`cd ${srcdir}; pwd` @@ -64,9 +33,8 @@ AC_OUTPUT([ include/Makefile include/yazproxy/Makefile doc/Makefile - doc/yazproxy.xml + 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 ])