2 files changed, 9 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 8bc434acb..266756fe3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20030707
+ - (dtucker) [configure.ac] Bug #600: Check that getrusage is declared before
+   searching libraries for it.  Fixes build errors on NCR MP-RAS.
+
 20030706
  - (dtucker) [ssh-rand-helper.c loginrec.c]
    Apply atomicio typing change to these too.
@@ -658,4 +662,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2845 2003/07/06 05:20:46 dtucker Exp $
+$Id: ChangeLog,v 1.2846 2003/07/07 09:44:01 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 81ad26b03..8d9143e6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.130 2003/06/30 09:21:36 djm Exp $
+# $Id: configure.ac,v 1.131 2003/07/07 09:44:01 dtucker Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -674,7 +674,7 @@ AC_CHECK_FUNCS(\
         arc4random __b64_ntop b64_ntop __b64_pton b64_pton basename \
         bcopy bindresvport_sa clock fchmod fchown freeaddrinfo futimes \
         gai_strerror getaddrinfo getcwd getgrouplist getnameinfo getopt \
-        getpeereid _getpty getrlimit getrusage getttyent glob inet_aton \
+        getpeereid _getpty getrlimit getttyent glob inet_aton \
         inet_ntoa inet_ntop innetgr login_getcapbool md5_crypt memmove \
         mkdtemp mmap ngetaddrinfo nsleep ogetaddrinfo openlog_r openpty \
         pstat readpassphrase realpath recvmsg rresvport_af sendmsg \
@@ -688,8 +688,9 @@ AC_CHECK_FUNCS(\
 AC_SEARCH_LIBS(nanosleep, rt posix4, AC_DEFINE(HAVE_NANOSLEEP))
 AC_SEARCH_LIBS(basename, gen, AC_DEFINE(HAVE_BASENAME))
 
-dnl Make sure strsep prototype is defined before defining HAVE_STRSEP
+dnl Make sure prototypes are defined for these before using them.
 AC_CHECK_DECL(strsep, [AC_CHECK_FUNCS(strsep)])
+AC_CHECK_DECL(getrusage, [AC_CHECK_FUNCS(getrusage)])
 
 dnl IRIX and Solaris 2.5.1 have dirname() in libgen
 AC_CHECK_FUNCS(dirname, [AC_CHECK_HEADERS(libgen.h)] ,[