X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=578ee1ff510f21b71e6edd859ba7e4e7776c1b4a;hp=235a47bf04340a34c2283727d8297419214d4508;hb=4b7c2f0df1625768a1e88e575144f2744e9825d5;hpb=0f22e8ea0099e3fbf082ebd37095000be7ff0c45

diff --git a/configure.ac b/configure.ac
index 235a47b..578ee1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
-dnl Zebra, Index Data ApS, 1995-2007
-dnl $Id: configure.ac,v 1.70 2007-12-20 11:03:53 adam Exp $
+dnl This file is part of the Zebra server.
+dnl   Copyright (C) 1994-2009 Index Data
 dnl
-AC_PREREQ(2.59)
-AC_INIT([idzebra],[2.0.21],[zebra-help@indexdata.dk])
+AC_PREREQ(2.60)
+AC_INIT([idzebra],[2.0.44],[zebra-help@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)
 AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE([1.8])
+AM_INIT_AUTOMAKE([1.9])
 PACKAGE_SUFFIX="-2.0"
 AC_SUBST(PACKAGE_SUFFIX)
 dnl http://www.gnu.org/software/libtool/manual.html#Versioning
@@ -34,7 +34,7 @@ if test "$ac_cv_lib_crypt_crypt" = "yes"; then
 fi
 dnl
 dnl ------ YAZ
-YAZ_INIT([server icu],[3.0.17])
+YAZ_INIT([server icu],[3.0.47])
 if test "$YAZVERSION" = "NONE"; then
     AC_MSG_ERROR([YAZ development libraries required])
 fi
@@ -174,6 +174,11 @@ else
     fi
 fi
 dnl
+dnl ------- zlib
+AC_CHECK_LIB([z],[compress2])
+if test "$ac_cv_lib_z_compress2" = "yes"; then
+    AC_CHECK_HEADERS([zlib.h])
+fi
 dnl ------ -lm
 AC_CHECK_LIB(m,sqrt)
 dnl ------ -ldl
@@ -288,13 +293,28 @@ ZEBRA_MODULE(safari,shared,[  --enable-mod-safari     Safari filter (DBC)])
 dnl ------ ANSI C Header files
 AC_STDC_HEADERS
 if test "$ac_cv_header_stdc" = "no"; then
-    AC_MSG_WARN(Your system doesn't seem to support ANSI C)
+    AC_MSG_WARN([Your system does not seem to support ANSI C])
 fi
 AC_SUBST(IDZEBRA_SRC_ROOT)
 AC_SUBST(IDZEBRA_BUILD_ROOT)
 IDZEBRA_SRC_ROOT=`cd ${srcdir}; pwd`
 IDZEBRA_BUILD_ROOT=`pwd`
+dnl
+dnl ------ versioning
+dnl
+WIN_FILEVERSION=`echo $PACKAGE_VERSION | $AWK 'BEGIN { FS = "."; } { m = $4; printf("%d,%d,%d,%d", $1, $2, $3 == "" ? "0" : $3, $4 == "" ? "1" : $4);}'`
+AC_SUBST([WIN_FILEVERSION])
+VERSION_HEX=`echo $PACKAGE_VERSION | $AWK 'BEGIN { FS = "."; } { printf("%x", ($1 * 256 + $2) * 256 + $3);}'`
+AC_SUBST([VERSION_HEX])
+if test -d ${srcdir}/.git; then
+    VERSION_SHA1=`git show --pretty=format:%H|head -1`
+else
+    VERSION_SHA1=`head -1 ${srcdir}/ChangeLog|awk '{print $2}'`
+fi
+AC_SUBST([VERSION_SHA1])
+dnl
 dnl ------ Create Makefiles
+dnl
 AC_OUTPUT([
   Makefile
   util/Makefile
@@ -318,18 +338,23 @@ AC_OUTPUT([
   test/xpath/Makefile
   test/rusmarc/Makefile test/cddb/Makefile test/malxml/Makefile 
   test/mbox/Makefile
-  test/config/Makefile test/sort2/Makefile
+  test/config/Makefile
   test/xelm/Makefile
-  test/dmoz/Makefile test/sort/Makefile test/zsh/Makefile
+  test/dmoz/Makefile test/zsh/Makefile
   test/marcxml/Makefile test/charmap/Makefile test/codec/Makefile
   test/espec/Makefile
   test/filters/Makefile
-  examples/Makefile examples/gils/Makefile examples/zthes/Makefile
-  examples/marc21/Makefile examples/marcxml/Makefile 
-  examples/alvis-oai/Makefile
+  examples/Makefile 
+  examples/gils/Makefile 
+  examples/marc21/Makefile 
+  examples/marcxml/Makefile 
+  examples/oai-pmh/Makefile
+  examples/zthes/Makefile
   idzebra.spec
   idzebra-config-2.0
   Doxyfile
+  win/version.nsi
+  include/idzebra/version.h
 ],[sed s%echo_source=yes%echo_source=no%g < idzebra-config-2.0 > util/idzebra-config-2.0 && chmod +x idzebra-config-2.0 util/idzebra-config-2.0])
 
 echo \