X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.ac;h=62ab94b173ead64422fe4f5085431bbb0d558f1e;hb=d3a8af85f8c4bae492ab6b5fa3bd488fbfcb07fb;hp=e4f77b86e1577c4d04773f8f52471acf6e33cf8b;hpb=17754af10efbca4028a845fbee67e6f800fec8d6;p=pazpar2-moved-to-github.git

diff --git a/configure.ac b/configure.ac
index e4f77b8..62ab94b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,13 @@
 ## -*- Autoconf -*-
 ## This file is part of Pazpar2.
+## Copyright (C) 2006-2012 Index Data
 ## Process this file with autoconf to produce a configure script.
 
 # Autoconf and automake setup
 AC_PREREQ(2.60)
-AC_INIT([pazpar2],[1.2.0],[pazpar2-help@indexdata.dk])
+AC_INIT([pazpar2],
+m4_esyscmd([. ./IDMETA; echo $VERSION|tr -d '\n']),
+[pazpar2-help@indexdata.dk])
 
 AC_CONFIG_HEADERS(src/config.h)
 
@@ -21,13 +24,14 @@ AC_LANG(C)
 
 AC_C_INLINE
 
-YAZ_INIT([static icu threads],[3.0.46])
+YAZ_INIT([static icu],[4.2.20])
 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 glob.h])
+AC_SEARCH_LIBS([log],[m])
+AC_CHECK_HEADERS([sys/time.h sys/socket.h unistd.h netinet/in.h netdb.h arpa/inet.h])
 checkBoth=0
 AC_CHECK_FUNC([connect])
 if test "$ac_cv_func_connect" = "no"; then
@@ -39,7 +43,7 @@ if test "$checkBoth" = "1"; then
     AC_CHECK_FUNC([accept], , [LIBS=$oldLibs])
 fi
 AC_CHECK_FUNC([gethostbyname], ,[AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"])])
-AC_CHECK_FUNCS([getaddrinfo])
+AC_CHECK_FUNCS([getaddrinfo mallinfo])
 
 if test -d ${srcdir}/.git; then
 	sha=`git show --pretty=format:%H|head -1`
@@ -78,12 +82,8 @@ echo \
   Linked libs:                ${LIBS}
   Host System Type:           ${host}
   Install path:               ${prefix}
-  Automake:                   ${AUTOMAKE}
-  Archiver:                   ${AR}
-  Ranlib:                     ${RANLIB}
   YAZ Version:                ${YAZVERSION}
   YAZ Include:                ${YAZINC}
-  YAZ La Lib:                 ${YAZLALIB}
   YAZ Lib:                    ${YAZLIB}
   Bugreport:                  ${PACKAGE_BUGREPORT}