TCPD libs only used in libyaz's LIBADD

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

diff --git a/configure.ac b/configure.ac
index 5453b5c..7570d2a 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-2009 Index Data
+dnl Copyright (C) 1995-2010 Index Data
 AC_PREREQ([2.60])
-AC_INIT([yaz],[3.0.44],[yaz-help@indexdata.dk])
+AC_INIT([yaz],[4.0.4],[yaz-help@indexdata.dk])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([1.9])
@@ -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