X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=aclocal.m4;h=a7e5447493dfa28ba4ab9564b7a7fceb1a5c68c3;hb=6bd76adcc81f4a725352c338a39212bcdefb0a4b;hp=c0d4fb8af6389082f99e55043ff3f1fd85c89027;hpb=0cd75fec1902ab5540539fe8c95a071caf18f58e;p=mmh

diff --git a/aclocal.m4 b/aclocal.m4
index c0d4fb8..a7e5447 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.
+# 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_CHECK_FUNC(gethostbyname, ,
-  AC_CHECK_LIB(nsl, gethostbyname, ,
-    AC_CHECK_LIB(resolv, gethostbyname)))
-AC_CHECK_FUNC(socket, ,
-  AC_CHECK_LIB(socket, socket))
-])
+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
@@ -66,11 +56,11 @@ dnl my autoconf skills -- feel free to put it in :-> -- PMM
 
 nmh_saved_libs="$LIBS"
 LIBS="$nmh_libs $5 $LIBS"
-AC_LINK_IFELSE(AC_LANG_PROGRAM([[
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #define DB_DBM_HSEARCH 1
 #include <$1>
 ]],
-[[dbm_open("",0,0);]]),[nmh_ndbm_found=yes],[nmh_ndbm_found=no])
+[[dbm_open("",0,0);]])],[nmh_ndbm_found=yes],[nmh_ndbm_found=no])
 LIBS="$nmh_saved_libs"
 
 if test "$nmh_ndbm_found" = "yes"; then