---- yaz-2.1.16/configure.ac.orig 2004-11-09 21:35:30.000000000 +0100
-+++ yaz-2.1.16/configure.ac 2004-11-22 23:41:13.606211824 +0100
-@@ -206,6 +206,7 @@
+--- yaz-2.1.22/configure.ac.orig 2006-06-15 15:38:05.000000000 +0200
++++ yaz-2.1.22/configure.ac 2006-07-22 15:39:52.050565250 +0200
+@@ -231,6 +231,7 @@
dnl
dnl ------ tcpd
AC_ARG_ENABLE(tcpd,[ --enable-tcpd[=PREFIX] enable TCP wrapper for server if available])
+WRAPLIBS=""
if test "$enable_tcpd" -a "$enable_tcpd" != "no"; then
- oldLibs=$LIBS
- oldCPPFLAGS=$CPPFLAGS
-@@ -214,7 +215,7 @@
- CPPFLAGS="$CPPFLAGS -I$enable_tcpd/include"
- fi
- AC_MSG_CHECKING(for working tcpd.h)
-- LIBS="$LIBS -lwrap -lnsl"
-+ LIBS="$LIBS -lwrap"
- AC_TRY_LINK([#include <syslog.h>
+ oldLibs=$LIBS
+ oldCPPFLAGS=$CPPFLAGS
+@@ -239,7 +240,7 @@
+ CPPFLAGS="$CPPFLAGS -I$enable_tcpd/include"
+ fi
+ AC_MSG_CHECKING(for working tcpd.h)
+- LIBS="$LIBS -lwrap -lnsl"
++ LIBS="$LIBS -lwrap"
+ AC_TRY_LINK([#include <syslog.h>
#include <tcpd.h>
- int allow_severity = LOG_INFO;
-@@ -225,13 +226,15 @@
- if test "$tcpd_ok" = "0"; then
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([tcpd development libraries missing])
-- LIBS=$oldLibs
- CPPFLAGS=$oldCPPFLAGS
- else
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_TCPD_H)
-+ WRAPLIBS="-lwrap"
- fi
-+ LIBS=$oldLibs
+ int allow_severity = LOG_INFO;
+@@ -255,8 +256,11 @@
+ else
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_TCPD_H)
++ WRAPLIBS="-lwrap"
+ fi
++ LIBS=$oldLibs
fi
+AC_SUBST(WRAPLIBS)
dnl
- dnl ------ Headers
- AC_CHECK_HEADERS(fnmatch.h wchar.h locale.h langinfo.h)
+ AC_SUBST(THREAD_CFLAGS)
+ HAVETHREADS=0
--- yaz-2.0.6/src/Makefile.am.orig 2003-10-27 13:21:30.000000000 +0100
+++ yaz-2.0.6/src/Makefile.am 2003-12-07 11:14:22.779872136 +0100
@@ -64,6 +64,7 @@