X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=aclocal.m4;h=20d123fee02742f913f3943804d662aa7f6e3ec2;hp=7941c0763cdb96e7d8a5167d09a111d46514c6b0;hb=da304a48a24d7cc7fafae13c994d94ad3d6483f2;hpb=8b0b9f913c2f0987ba8337178d3a6b3dcae906e6

diff --git a/aclocal.m4 b/aclocal.m4
index 7941c07..20d123f 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