X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=aclocal.m4;h=fcc5fbd7225e4e7cd41045ea5c648269e83c1f1c;hb=3cc8ed080f6e741b8df04a3ebe764c659e75cb38;hp=7941c0763cdb96e7d8a5167d09a111d46514c6b0;hpb=7b98850d3b8b2453b473fdfb6db52f4aa3fe39b6;p=mmh

diff --git a/aclocal.m4 b/aclocal.m4
index 7941c07..fcc5fbd 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,24 +1,14 @@
 
-# Originally by John Hawkinson <jhawk@mit.edu>
-# Under Solaris, those
-# applications need to link with "-lsocket -lnsl".  Under IRIX, they
-# need to link with "-lnsl" but should *not* link with "-lsocket"
-# because libsocket.a breaks a number of things (for instance,
-# gethostbyname() under IRIX 5.2, and snoop sockets under most versions
-# of IRIX).
 #
-# The check for libresolv is in case you are attempting to link
-# statically and happen to have a libresolv.a lying around (and no
-# libnsl.a). An example of such a case would be Solaris with
-# BIND 4.9.5 installed.
-
-AC_DEFUN(AC_CHECK_NETLIBS,
-[AC_CHECK_FUNC(getaddrinfo, ,
-  AC_CHECK_LIB(nsl, getaddrinfo, ,
-    AC_CHECK_LIB(resolv, getaddrinfo)))
-AC_CHECK_FUNC(socket, ,
-  AC_CHECK_LIB(socket, socket))
-])
+# Updated for more modern systems.  Check to see if we need to link against
+# optional libraries for networking functions.
+#
+
+AC_DEFUN([AC_CHECK_NETLIBS],
+[AC_SEARCH_LIBS([gethostbyname], [nsl], ,
+		[AC_MSG_ERROR([gethostbyname not found])])
+ AC_SEARCH_LIBS([connect], [socket], , [AC_MSG_ERROR([connect not found])])
+])dnl
 
 dnl --------------
 dnl CHECK FOR NDBM
@@ -35,7 +25,7 @@ dnl nmh_ndbmheader to the first arg and nmh_ndbm to the second.
 
 dnl If this macro accepted a list of include,library tuples
 dnl to test in order that would be cleaner than the current
-dnl nest of calls in configure.in.
+dnl nest of calls in configure.ac.
 
 dnl We try to link our own code fragment (which includes the
 dnl headers in the same way slocal.c does) rather than