X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.ac;h=7570d2ac4c92abbdbfefc95e25bdb30ff4add372;hb=fd8292660a22b62a4b2c6c1ef8482e639975e592;hp=c3f0e5b7136f7122b7244e5f72add4826a0dcb6e;hpb=bda8349bc60d3a56197826c6b8095dda26d7b4f6;p=yaz-moved-to-github.git

diff --git a/configure.ac b/configure.ac
index c3f0e5b..7570d2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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,7 +335,7 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
 		done
 		LIBS=$OLIBS
 	    fi
-	    LIBS=$PTHREAD_LIBS
+	    LIBS="$LIBS $PTHREAD_LIBS"
 	    CFLAGS="$CFLAGS -DYAZ_POSIX_THREADS=1"
 	    YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_POSIX_THREADS=1"
 	    ])