Pazpar2 1.4.4-2 for squeeze

[pazpar2-moved-to-github.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2bce9ba..bfe01d5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,40 +1,57 @@
 ## -*- Autoconf -*-
+## This file is part of Pazpar2.
 ## Process this file with autoconf to produce a configure script.
 
 # Autoconf and automake setup
-AC_PREREQ(2.59)
-AC_INIT([pazpar2],[1.0.5],[pazpar2-help@indexdata.dk])
+AC_PREREQ(2.60)
+AC_INIT([pazpar2],[1.4.4],[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])
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE([1.8])
+AM_INIT_AUTOMAKE([1.9])
 
 AC_PROG_CC
 AC_PROG_RANLIB
 
 AC_LANG(C)
 
-YAZ_INIT([static threads],[3.0.4])
+AC_C_INLINE
+
+YAZ_INIT([static icu],[4.0.12])
 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])
+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])
-AC_CHECK_ICU(3.6, [], 
-    AC_MSG_WARN([For ICU internationalizing support please install libicu36-dev or similar]))
 
-dnl Breaks 'make dist'
-dnl ln -sf ../../js/pz2.js www/example/pz2.js
-dnl ln -sf ../../../js/pz2.js www/masterkey/js/pz2.js
+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
+       pazpar2.spec
        src/Makefile
        test/Makefile
        js/Makefile
@@ -42,7 +59,7 @@ AC_CONFIG_FILES([
        doc/local.ent
        doc/common/Makefile
        doc/common/print.dsl
-
+       win/version.nsi
 ])
 
 AC_OUTPUT
@@ -69,9 +86,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}
 
 ------------------------------------------------------------------------"