sometime tcp-wrappers uses NIS (libnsl)

diff --git a/macros/tcp-wrappers.m4 b/macros/tcp-wrappers.m4
index c663d2dd59f49d8852d76017b8083c76e0c169c4..b56d4275687efc8d2187ef562858dca9d437b6c1 100644 (file)
--- a/macros/tcp-wrappers.m4
+++ b/macros/tcp-wrappers.m4
@@ -1,4 +1,4 @@
-dnl $Id: tcp-wrappers.m4,v 1.1.4.4 2004-08-11 03:05:45 bfernhomberg Exp $
+dnl $Id: tcp-wrappers.m4,v 1.1.4.4.2.1 2008-08-11 17:39:22 didg Exp $
 
 AC_DEFUN([NETATALK_TCP_WRAPPERS], [
        check=maybe
@@ -17,14 +17,20 @@ AC_DEFUN([NETATALK_TCP_WRAPPERS], [
        netatalk_cv_tcpwrap=no
        if test "x$wrapcheck" != "xno"; then
                saved_LIBS=$LIBS
-               LIBS="$LIBS -lwrap"
-               AC_TRY_LINK([
-#include <tcpd.h>
-int allow_severity = 0;
-int deny_severity = 0;
-],[
-       tcpd_warn ("link test");
-], netatalk_cv_tcpwrap=yes, netatalk_cv_tcpwrap=no, netatalk_cv_tcpwrap=cross)
+               W_LIBS="-lwrap" 
+               LIBS="$LIBS $W_LIBS"
+               AC_TRY_LINK([ int allow_severity = 0; int deny_severity = 0;]
+                       ,[hosts_access();]
+                       , netatalk_cv_tcpwrap=yes , 
+                       [
+                               LIBS=$saved_LIBS
+                               W_LIBS="-lwrap -lnsl" 
+                               LIBS="$LIBS $W_LIBS"
+                               AC_TRY_LINK([ int allow_severity = 0; int deny_severity = 0;]
+                                       ,[hosts_access();]
+                                       , netatalk_cv_tcpwrap=yes , netatalk_cv_tcpwrap=no)
+                       ]
+                       , netatalk_cv_tcpwrap=cross)
 
                LIBS=$saved_LIBS
        fi
@@ -32,7 +38,7 @@ int deny_severity = 0;
        AC_MSG_CHECKING([whether to enable the TCP wrappers])
        if test "x$netatalk_cv_tcpwrap" = "xyes"; then
                AC_DEFINE(TCPWRAP, 1, [Define if TCP wrappers should be used])
-               WRAP_LIBS="-lwrap"
+               WRAP_LIBS=$W_LIBS
                AC_MSG_RESULT([yes])
        else
                if test "x$wrapcheck" = "xyes"; then