X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=e66de0d5062b3fa15bb071c2d83975a55cee7870;hp=7a4a80b11497f48b01d5461ba1647afc791c0c63;hb=c74a60c3ae22031f6e2f4a98329e0014df3031ed;hpb=4802882b18ca83377532a8b249966b89059e6c13 diff --git a/configure.ac b/configure.ac index 7a4a80b..e66de0d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,20 +1,20 @@ -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.8 2006-05-01 09:17:10 adam Exp $ -AC_PREREQ(2.59) -AC_INIT([yazproxy],[1.2.1],[adam@indexdata.dk]) +AC_PREREQ(2.60) +AC_INIT([yazproxy], +m4_esyscmd([. ./IDMETA; echo $VERSION|tr -d '\n']), +[yaz-help@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 +22,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,11 +35,8 @@ AC_OUTPUT([ include/Makefile include/yazproxy/Makefile doc/Makefile - doc/yazproxy.xml + doc/local.ent doc/common/Makefile - doc/common/html.dsl - doc/common/html.xsl doc/common/print.dsl - doc/common/tkl.xsl etc/Makefile ])