no need any more for seperate NSLLIB or SOCKETLIB. We just

	add them all to LIBS, and let the linker sort out which ones
	are necessary.

diff --git a/Make.inc.in b/Make.inc.in
index e973331..345d70c 100644 (file)
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -28,8 +28,6 @@ LIBTOOL               = @LIBTOOL@
 
 LCRYPT         = @CRYPTLIB@
 LDBM           = @DBMLIB@
-SOCKETLIB      = @SOCKETLIB@
-NSLLIB         = @NSLLIB@
 LIBS           = @LIBS@
 
 LOGDIR         = @logdir@

diff --git a/configure.in b/configure.in
index 4617ed3..936ac1e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -336,22 +336,16 @@ if test "$WITH_THREAD_POOL" = "yes"; then
   fi
 fi
 
-dnl Check for -lsocket
-AC_CHECK_LIB(socket, getsockname,
-  SOCKETLIB="-lsocket"
-)
-AC_SUBST(SOCKETLIB)
+dnl Check if we need -lsocket
+AC_CHECK_LIB(socket, getsockname)
 
 dnl Check for -lresolv
 dnl This library may be needed later.
 AC_CHECK_LIB(resolv, inet_aton)
 
-dnl Check for -lnsl. We don't need yp_all, but usually if we want to
+dnl Check if we need -lnsl. Usually if we want to
 dnl link against -lsocket we need to include -lnsl as well.
-AC_CHECK_LIB(nsl, yp_all,
-  NSLLIB="-lnsl",
-)
-AC_SUBST(NSLLIB)
+AC_CHECK_LIB(nsl, inet_ntoa)
 
 dnl #############################################################
 dnl #