X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.ac;h=4c53253dc307c3b534c54be78d85456af0147065;hb=98c9356102a338238afc5b85af52acc4c8a2267c;hp=e19a7d85eae0aab40f2f7db8a5fe5c314ec86649;hpb=2d62c5f62ff7e2a7f1420e3cda22fb4cf0fcf8a4;p=pazpar2-moved-to-github.git

diff --git a/configure.ac b/configure.ac
index e19a7d8..4c53253 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.0.9],[pazpar2-help@indexdata.dk])
+AC_INIT([pazpar2],[1.6.2],[pazpar2-help@indexdata.dk])
 
 AC_CONFIG_HEADERS(src/config.h)
 
@@ -19,15 +20,36 @@ AC_PROG_RANLIB
 
 AC_LANG(C)
 
-YAZ_INIT([static threads],[3.0.29])
+AC_C_INLINE
+
+YAZ_INIT([static icu],[4.2.0])
 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])
-AC_CHECK_ICU([3.6],[ICU_CPPFLAGS="$ICU_CPPFLAGS -D HAVE_ICU=1"])
+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`
+else
+	sha=`head -1 ${srcdir}/ChangeLog|awk '{print $2}'`
+fi
+AC_DEFINE_UNQUOTED([PAZPAR2_VERSION_SHA1], ["$sha"], [Git SHA1])
+
 AC_CONFIG_FILES([
 	Doxyfile
 	Makefile
@@ -38,7 +60,7 @@ AC_CONFIG_FILES([
 	doc/local.ent
 	doc/common/Makefile
 	doc/common/print.dsl
-
+	win/version.nsi
 ])
 
 AC_OUTPUT
@@ -58,16 +80,9 @@ 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}
-  ICU Version:                ${ICU_VERSION}
-  ICU Include:                ${ICU_CPPFLAGS}
-  ICU Lib:                    ${ICU_LIBS}
   Bugreport:                  ${PACKAGE_BUGREPORT}
 
 ------------------------------------------------------------------------"