X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=macros%2Ftcp-wrappers.m4;h=76b75a09cd05a85d633c1bdfd20645d83cb86f82;hb=82195e48bedce7bf1e214679c3cceb0cb33845eb;hp=3274d1d73bf8cd408f1e3641829275e69df3b902;hpb=3a144b131de045795dad1de4cb873bd6744690ab;p=netatalk.git

diff --git a/macros/tcp-wrappers.m4 b/macros/tcp-wrappers.m4
index 3274d1d7..76b75a09 100644
--- a/macros/tcp-wrappers.m4
+++ b/macros/tcp-wrappers.m4
@@ -1,30 +1,46 @@
-dnl $Id: tcp-wrappers.m4,v 1.1 2003-06-12 23:15:07 srittau Exp $
 
-AC_DEFUN([NETATALK_TCP_WRAPPERS], [
+AC_DEFUN([AC_NETATALK_TCP_WRAPPERS], [
 	check=maybe
 	AC_ARG_ENABLE(tcp-wrappers,
 		[  --disable-tcp-wrappers  disable TCP wrappers support],
 		[
-			if test "x$enableval" == "xno"; then
-				check=no
+			if test "x$enableval" = "xno"; then
+				wrapcheck=no
 			else
-				check=yes
+				wrapcheck=yes
 			fi
 		]
 	)
 
 	enable=no
-	if test "x$check" != "xno"; then
-		AC_CHECK_LIB(wrap, tcpd_warn, enable=yes)
+	netatalk_cv_tcpwrap=no
+	if test "x$wrapcheck" != "xno"; then
+		saved_LIBS=$LIBS
+		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
 
 	AC_MSG_CHECKING([whether to enable the TCP wrappers])
-	if test "x$enable" == "xyes"; then
+	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$check" == "xyes"; then
+		if test "x$wrapcheck" = "xyes"; then
 			AC_MSG_ERROR([libwrap not found])
 		else
 			AC_MSG_RESULT([no])