X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.ac;h=2739cf7e2c7edf1ac00fdc9a51d18836352aa797;hb=6e17eec537a0a2084b10774ec97fbbedb7061042;hp=e17d571fd450dbb0083277718a2d262e3f2de748;hpb=36c75600efc5b12b63538381e2637316874f2fe1;p=pazpar2-moved-to-github.git

diff --git a/configure.ac b/configure.ac
index e17d571..2739cf7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,11 @@
 ## -*- Autoconf -*-
 ## This file is part of Pazpar2.
+## Copyright (C) 2006-2011 Index Data
 ## Process this file with autoconf to produce a configure script.
 
 # Autoconf and automake setup
 AC_PREREQ(2.60)
-AC_INIT([pazpar2],[1.1.0],[pazpar2-help@indexdata.dk])
+AC_INIT([pazpar2],[1.6.5],[pazpar2-help@indexdata.dk])
 
 AC_CONFIG_HEADERS(src/config.h)
 
@@ -19,14 +20,28 @@ AC_PROG_RANLIB
 
 AC_LANG(C)
 
-YAZ_INIT([static icu threads],[3.0.39])
+AC_C_INLINE
+
+YAZ_INIT([static icu],[4.2.20])
 if test -z "$YAZLIB"; then
 	AC_MSG_ERROR([YAZ development libraries missing])
 fi
 YAZ_DOC
 
+AC_SEARCH_LIBS([log],[m])
 AC_CHECK_HEADERS([sys/time.h sys/socket.h unistd.h netinet/in.h netdb.h arpa/inet.h])
-AC_CHECK_FUNCS([getaddrinfo])
+checkBoth=0
+AC_CHECK_FUNC([connect])
+if test "$ac_cv_func_connect" = "no"; then
+    AC_CHECK_LIB([socket],[main], LIBS="$LIBS -lsocket", checkBoth=1)
+fi
+if test "$checkBoth" = "1"; then
+    oldLibs=$LIBS
+    LIBS="$LIBS -lsocket -lnsl"
+    AC_CHECK_FUNC([accept], , [LIBS=$oldLibs])
+fi
+AC_CHECK_FUNC([gethostbyname], ,[AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"])])
+AC_CHECK_FUNCS([getaddrinfo mallinfo])
 
 if test -d ${srcdir}/.git; then
 	sha=`git show --pretty=format:%H|head -1`
@@ -65,12 +80,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}