summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 17491a41a..bbead8299 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
5 via mkstemp in some configurations. ok djm@ 5 via mkstemp in some configurations. ok djm@
6 - (dtucker) [auth-shadow.c] Prevent compiler warnings if "DAY" is defined 6 - (dtucker) [auth-shadow.c] Prevent compiler warnings if "DAY" is defined
7 by the system headers. 7 by the system headers.
8 - (dtucker) [configure.ac] Bug #893: check for libresolv early on Reliant
9 Unix; prevents problems relating to the location of -lresolv in the
10 link order.
8 11
920050215 1220050215
10 - (dtucker) [config.sh.in] Collect oslevel -r too. 13 - (dtucker) [config.sh.in] Collect oslevel -r too.
@@ -2139,4 +2142,4 @@
2139 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2142 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2140 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2143 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2141 2144
2142$Id: ChangeLog,v 1.3656 2005/02/16 03:20:06 dtucker Exp $ 2145$Id: ChangeLog,v 1.3657 2005/02/16 05:19:17 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index b27f0cf70..aa6aed6b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.242 2005/02/15 10:45:57 dtucker Exp $ 1# $Id: configure.ac,v 1.243 2005/02/16 05:19:17 dtucker Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -339,6 +339,8 @@ mips-sony-bsd|mips-sony-newsos4)
339*-sni-sysv*) 339*-sni-sysv*)
340 # /usr/ucblib MUST NOT be searched on ReliantUNIX 340 # /usr/ucblib MUST NOT be searched on ReliantUNIX
341 AC_CHECK_LIB(dl, dlsym, ,) 341 AC_CHECK_LIB(dl, dlsym, ,)
342 # -lresolv needs to be at then end of LIBS or DNS lookups break
343 AC_CHECK_LIB(res_query, resolv, [ LIBS="$LIBS -lresolv" ])
342 IPADDR_IN_DISPLAY=yes 344 IPADDR_IN_DISPLAY=yes
343 AC_DEFINE(USE_PIPES) 345 AC_DEFINE(USE_PIPES)
344 AC_DEFINE(IP_TOS_IS_BROKEN) 346 AC_DEFINE(IP_TOS_IS_BROKEN)