From: ross <unknown>
Date: Fri, 22 Jul 2005 16:25:16 +0000 (+0000)
Subject: [project @ 2005-07-22 16:25:16 by ross]
X-Git-Tag: cmm-merge2~44
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=d644424fc0c7927947150e254bce09ae5302c485;p=haskell-directory.git

[project @ 2005-07-22 16:25:16 by ross]
revert 1.17
---

diff --git a/configure.ac b/configure.ac
index c28fd76..34ee36f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,9 +29,6 @@ AC_CHECK_FUNCS([ftime gmtime_r localtime_r lstat readdir_r])
 
 AC_CHECK_FUNCS([_chsize ftruncate])
 
-AC_SEARCH_LIBS([gethostbyname], [nsl wsock32])
-AC_SEARCH_LIBS([recv], [socket wsock32])
-
 # map standard C types and ISO types to Haskell types
 FPTOOLS_CHECK_HTYPE(char)
 FPTOOLS_CHECK_HTYPE(signed char)
@@ -85,7 +82,11 @@ FP_CHECK_CONST([O_BINARY], [#include <fcntl.h>], [0])
 # Check for idiosyncracies in some mingw impls of directory handling.
 FP_READDIR_EOF_ERRNO
 
-EXTRA_LIBS="`echo $LIBS | sed 's/-l//g'`"
+case "$host" in
+*-mingw32) EXTRA_LIBS="wsock32" ;;
+*-solaris2) EXTRA_LIBS="nsl socket" ;;
+*)	EXTRA_LIBS= ;;
+esac
 AC_SUBST([EXTRA_LIBS])
 
 AC_CONFIG_FILES([config.mk base.buildinfo])