X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=configure.ac;h=e17d571fd450dbb0083277718a2d262e3f2de748;hb=2628f9508a3b56be7071f2db91f9f4fd1f6f2d52;hp=7bcfc1dead45d39c849e14e489b1bce9c517dfb3;hpb=1ceabd4184b034eb6c86868c535476172606e1e8;p=pazpar2-moved-to-github.git

diff --git a/configure.ac b/configure.ac
index 7bcfc1d..e17d571 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,12 @@
 ## -*- Autoconf -*-
+## This file is part of Pazpar2.
 ## Process this file with autoconf to produce a configure script.
 
 # Autoconf and automake setup
 AC_PREREQ(2.60)
-AC_INIT([pazpar2],[1.0.5],[pazpar2-help@indexdata.dk])
+AC_INIT([pazpar2],[1.1.0],[pazpar2-help@indexdata.dk])
 
-AC_CONFIG_HEADERS(src/cconfig.h)
+AC_CONFIG_HEADERS(src/config.h)
 
 AC_CONFIG_SRCDIR([configure.ac]) 
 AC_CONFIG_AUX_DIR([config])
@@ -18,14 +19,22 @@ AC_PROG_RANLIB
 
 AC_LANG(C)
 
-YAZ_INIT([static threads],[3.0.25])
+YAZ_INIT([static icu threads],[3.0.39])
 if test -z "$YAZLIB"; then
 	AC_MSG_ERROR([YAZ development libraries missing])
 fi
 YAZ_DOC
 
+AC_CHECK_HEADERS([sys/time.h sys/socket.h unistd.h netinet/in.h netdb.h arpa/inet.h])
 AC_CHECK_FUNCS([getaddrinfo])
-AC_CHECK_ICU([3.6],[ICU_CPPFLAGS="$ICU_CPPFLAGS -D HAVE_ICU=1"])
+
+if test -d ${srcdir}/.git; then
+	sha=`git show --pretty=format:%H|head -1`
+else
+	sha=`head -1 ${srcdir}/ChangeLog|awk '{print $2}'`
+fi
+AC_DEFINE_UNQUOTED([PAZPAR2_VERSION_SHA1], ["$sha"], [Git SHA1])
+
 AC_CONFIG_FILES([
 	Doxyfile
 	Makefile
@@ -36,7 +45,7 @@ AC_CONFIG_FILES([
 	doc/local.ent
 	doc/common/Makefile
 	doc/common/print.dsl
-
+	win/version.nsi
 ])
 
 AC_OUTPUT
@@ -63,9 +72,6 @@ echo \
   YAZ Include:                ${YAZINC}
   YAZ La Lib:                 ${YAZLALIB}
   YAZ Lib:                    ${YAZLIB}
-  ICU Version:                ${ICU_VERSION}
-  ICU Include:                ${ICU_CPPFLAGS}
-  ICU Lib:                    ${ICU_LIBS}
   Bugreport:                  ${PACKAGE_BUGREPORT}
 
 ------------------------------------------------------------------------"