Version 4.1.1

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

diff --git a/configure.ac b/configure.ac
index 7940588..8675960 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl This file is part of the YAZ toolkit.
-dnl Copyright (C) 1995-2008 Index Data
+dnl Copyright (C) 1995-2010 Index Data
 AC_PREREQ([2.60])
-AC_INIT([yaz],[3.0.39],[yaz-help@indexdata.dk])
+AC_INIT([yaz],[4.1.1],[yaz-help@indexdata.dk])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([1.9])
@@ -21,7 +21,7 @@ dnl
 YAZ_DOC
 dnl 
 dnl
-AC_CHECK_HEADERS([dirent.h fnmatch.h wchar.h locale.h langinfo.h pwd.h unistd.h sys/select.h sys/socket.h sys/stat.h sys/time.h sys/times.h sys/types.h sys/un.h sys/wait.h netdb.h arpa/inet.h netinet/tcp.h netinet/in_systm.h],[],[],[])
+AC_CHECK_HEADERS([dirent.h fnmatch.h wchar.h locale.h langinfo.h pwd.h unistd.h sys/select.h sys/socket.h sys/stat.h sys/time.h sys/times.h sys/types.h sys/un.h sys/wait.h sys/prctl.h netdb.h arpa/inet.h netinet/tcp.h netinet/in_systm.h],[],[],[])
 AC_CHECK_HEADERS([net/if.h netinet/in.h netinet/if_ether.h],[],[],[
  #if HAVE_SYS_TYPES_H
  #include <sys/types.h>
@@ -299,16 +299,18 @@ if test "$enable_tcpd" -a "$enable_tcpd" != "no"; then
        [struct request_info request_info; int i;
            i = hosts_access(&request_info);],
        tcpd_ok=1, tcpd_ok=0)
+    LIBS=$oldLibs
     if test "$tcpd_ok" = "0"; then
        AC_MSG_RESULT([no])
        AC_MSG_ERROR([tcpd development libraries missing])
-               LIBS=$oldLibs
-               CPPFLAGS=$oldCPPFLAGS
+       CPPFLAGS=$oldCPPFLAGS
     else
+       TCPD_LIBS="-lwrap"
        AC_MSG_RESULT([yes])
        AC_DEFINE([HAVE_TCPD_H])
     fi
 fi
+AC_SUBST([TCPD_LIBS])
 dnl
 AC_SUBST([YAZ_CONFIG_CFLAGS])
 dnl
@@ -333,8 +335,9 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
                done
                LIBS=$OLIBS
            fi
-           CFLAGS=$OCFLAGS
-           PTHREAD_CFLAGS="$PTHREAD_CFLAGS -DYAZ_POSIX_THREADS=1"
+           LIBS="$LIBS $PTHREAD_LIBS"
+           CFLAGS="$CFLAGS -DYAZ_POSIX_THREADS=1"
+           YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_POSIX_THREADS=1"
            ])
 fi
 
@@ -367,7 +370,7 @@ fi
 
 dnl
 dnl 
-AC_CHECK_ICU([3.6],[
+AC_CHECK_ICU([3.4],[
        if test "$xml_enabled" = "true"; then
            ICU_CPPFLAGS="$ICU_CPPFLAGS -D YAZ_HAVE_ICU=1"
        else
@@ -384,19 +387,13 @@ elif test "$enable_memdebug" = "no"; then
     AC_DEFINE([TRACE_XMALLOC],[0])
 fi
 dnl
-dnl ------ Using this for "in-source" yaz-config
-AC_SUBST([YAZ_SRC_ROOT])
-AC_SUBST([YAZ_BUILD_ROOT])
-YAZ_SRC_ROOT=`cd ${srcdir}; pwd`
-YAZ_BUILD_ROOT=`pwd`
-dnl
 dnl ------ versioning
 dnl
 WIN_FILEVERSION=`echo $PACKAGE_VERSION | $AWK 'BEGIN { FS = "."; } { m = $4; printf("%d,%d,%d,%d", $1, $2, $3 == "" ? "0" : $3, $4 == "" ? "1" : $4);}'`
 AC_SUBST([WIN_FILEVERSION])
-YAZ_VERSION_HEX=`echo $PACKAGE_VERSION | $AWK 'BEGIN { FS = "."; } { printf("%x", ($1 * 256 + $2) * 256 + $3);}'`
-AC_SUBST([YAZ_VERSION_HEX])
-if test ${srcdir}/.git; then
+VERSION_HEX=`echo $PACKAGE_VERSION | $AWK 'BEGIN { FS = "."; } { printf("%x", ($1 * 256 + $2) * 256 + $3);}'`
+AC_SUBST([VERSION_HEX])
+if test -d ${srcdir}/.git; then
     VERSION_SHA1=`git show --pretty=format:%H|head -1`
 else
     VERSION_SHA1=`head -1 ${srcdir}/ChangeLog|awk '{print $2}'`
@@ -427,7 +424,7 @@ Doxyfile
 win/version.nsi
 include/yaz/yaz-version.h
 ],[
-       sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config > util/yaz-config && chmod +x yaz-config util/yaz-config
+       sed s%echo_source=yes%echo_source=no%g < yaz-config > util/yaz-config && chmod +x yaz-config util/yaz-config
     ]
 )