Simplify yazpp-config a bit

[yazpp-moved-to-github.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index edb8747..43bb3f8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,10 @@
-dnl YAZ++ Toolkit, Index Data 1994-2007
+dnl YAZ++ Toolkit Index Data 1998-2010
 dnl See the file LICENSE for details.
-dnl $Id: configure.ac,v 1.18 2007-11-09 21:49:15 adam Exp $
-AC_PREREQ(2.59)
-AC_INIT([yazpp],[1.0.3],[adam@indexdata.dk])
+AC_PREREQ(2.60)
+AC_INIT([yazpp],[1.2.3],[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
@@ -13,21 +12,16 @@ AC_PROG_CXX
 AC_HEADER_STDC
 AM_PROG_LIBTOOL
 
-YAZ_INIT([threads],[3.0.15])
+YAZ_INIT([threads],[4.0.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,6 +35,7 @@ AC_OUTPUT([
        doc/local.ent
        doc/common/Makefile
        doc/common/print.dsl
+       yazpp.spec
 ],[sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yazpp-config >src/yazpp-config && chmod +x yazpp-config src/yazpp-config])