X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=ba5a95c5843673b1f0fc91e0a45666185b0cff53;hp=63d36b1d6cbf81f2a68cf544bec138d3961d1891;hb=0084c40d8bc6babaeb0b833b12d9cd625c807525;hpb=79076a95d4e3fc19cbf52bf2b7d35137809f3f7f

diff --git a/configure.ac b/configure.ac
index 63d36b1..ba5a95c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,13 @@
-dnl YAZ++ Toolkit, Index Data 1994-2006
-dnl See the file LICENSE for details.
-dnl $Id: configure.ac,v 1.15 2007-03-20 16:21:58 adam Exp $
-AC_PREREQ(2.59)
-AC_INIT([yazpp],[1.0.3],[adam@indexdata.dk])
+dnl This file is part of yazpp
+dnl Copyright (C) 1998-2012 Index Data
+AC_PREREQ(2.60)
+AC_INIT([yazpp],
+m4_esyscmd([. ./IDMETA; echo $VERSION|tr -d '\n']),
+[adam@indexdata.dk])
+AC_CONFIG_HEADERS([include/config.h])
 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
@@ -13,21 +15,16 @@ AC_PROG_CXX
 AC_HEADER_STDC
 AM_PROG_LIBTOOL
 
-YAZ_INIT(threads,2.1.50)
+YAZ_INIT([threads],[4.2.8])
 if test -z "$YAZLIB"; then
 	AC_MSG_ERROR([YAZ development libraries missing])
 fi
 YAZ_DOC
-AC_CHECK_HEADERS(unistd.h sys/stat.h sys/time.h sys/types.h)
+AC_CHECK_HEADERS([unistd.h sys/stat.h sys/time.h sys/types.h fcntl.h])
 
 AC_ARG_ENABLE(zoom,[  --disable-zoom          disable ZOOM (for old C++ compilers)],[enable_zoom=$enableval],[enable_zoom=yes])
 AM_CONDITIONAL(ZOOM, test $enable_zoom = "yes")
 
-AC_SUBST(YAZPP_SRC_ROOT)
-AC_SUBST(YAZPP_BUILD_ROOT)
-YAZPP_SRC_ROOT=`cd ${srcdir}; pwd`
-YAZPP_BUILD_ROOT=`pwd`
-
 AC_OUTPUT([
 	Doxyfile
 	Makefile
@@ -41,7 +38,7 @@ AC_OUTPUT([
 	doc/local.ent
 	doc/common/Makefile
 	doc/common/print.dsl
-],[sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yazpp-config >src/yazpp-config && chmod +x yazpp-config src/yazpp-config])
+],[sed s%echo_source=yes%echo_source=no%g < yazpp-config >src/yazpp-config && chmod +x yazpp-config src/yazpp-config])
 
 
 echo \