X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=configure.ac;h=4ae0cdd05fbced22ca7d0484ed0564afbc660663;hb=6cccb7664359e05547d867ccfc0fdac42edaa7ee;hp=673e3a61ed226f82de076c11f635f85febf53510;hpb=1ce77eede64b478d2df0b75d5c9d38a7948bca55;p=pazpar2-moved-to-github.git

diff --git a/configure.ac b/configure.ac
index 673e3a6..4ae0cdd 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.2.0],[pazpar2-help@indexdata.dk])
+AC_INIT([pazpar2],[1.5.6],[pazpar2-help@indexdata.dk])
 
 AC_CONFIG_HEADERS(src/config.h)
 
@@ -21,14 +22,26 @@ AC_LANG(C)
 
 AC_C_INLINE
 
-YAZ_INIT([static icu threads],[3.0.46])
+YAZ_INIT([static icu],[4.2.0])
 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_CHECK_FUNCS([getaddrinfo])
+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
+    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`