aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>1997-09-21 03:49:47 +0000
committerEric S. Raymond <esr@thyrsus.com>1997-09-21 03:49:47 +0000
commit314dc7dc3df37efa35058d8c1e3dd22dbbb2ed43 (patch)
tree8fa217ce61da0d1df0d8a05620bca5b6ad816d7a
parent3b10e5b664edb6c5847006ca7813be9f0adbc4c3 (diff)
downloadfetchmail-314dc7dc3df37efa35058d8c1e3dd22dbbb2ed43.tar.gz
fetchmail-314dc7dc3df37efa35058d8c1e3dd22dbbb2ed43.tar.bz2
fetchmail-314dc7dc3df37efa35058d8c1e3dd22dbbb2ed43.zip
Greg Stark's fix.
svn path=/trunk/; revision=1381
-rw-r--r--NEWS1
-rw-r--r--configure.in6
2 files changed, 6 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index cef38475..d8d43e7f 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,7 @@
------------------------------------------------------------------------------
fetchmail-4.2.5 ()
* Alexander Kourakos corrected his patch to avoid a buffer overrun.
+* Greg Stark's patch for better autoconfiguration on mixed libc5/libc6 systems.
There are 287 people on the fetchmail-friends list.
diff --git a/configure.in b/configure.in
index 698fc1e9..e8908274 100644
--- a/configure.in
+++ b/configure.in
@@ -40,7 +40,11 @@ AC_CHECK_FUNC(socket,
AC_CHECK_LIB(socket,socket)
AC_CHECK_LIB(inet,socket))
-AC_CHECK_LIB(nsl,inet_addr)
+# The condition in this test copes with the presence of inet_addr in libc6.
+AC_CHECK_FUNC(inet_addr,
+ AC_MSG_RESULT(using libc's inet_addr),
+ AC_CHECK_LIB(nsl,inet_addr))
+
AC_CHECK_LIB(opie,opiegenerator)
dnl Port hack for Interactive UNIX System V/386 Release 3.2