summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac7
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 @@
120030707
2 - (dtucker) [configure.ac] Bug #600: Check that getrusage is declared before
3 searching libraries for it. Fixes build errors on NCR MP-RAS.
4
120030706 520030706
2 - (dtucker) [ssh-rand-helper.c loginrec.c] 6 - (dtucker) [ssh-rand-helper.c loginrec.c]
3 Apply atomicio typing change to these too. 7 Apply atomicio typing change to these too.
@@ -658,4 +662,4 @@
658 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 662 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
659 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 663 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
660 664
661$Id: ChangeLog,v 1.2845 2003/07/06 05:20:46 dtucker Exp $ 665$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 @@
1# $Id: configure.ac,v 1.130 2003/06/30 09:21:36 djm Exp $ 1# $Id: configure.ac,v 1.131 2003/07/07 09:44:01 dtucker Exp $
2 2
3AC_INIT 3AC_INIT
4AC_CONFIG_SRCDIR([ssh.c]) 4AC_CONFIG_SRCDIR([ssh.c])
@@ -674,7 +674,7 @@ AC_CHECK_FUNCS(\
674 arc4random __b64_ntop b64_ntop __b64_pton b64_pton basename \ 674 arc4random __b64_ntop b64_ntop __b64_pton b64_pton basename \
675 bcopy bindresvport_sa clock fchmod fchown freeaddrinfo futimes \ 675 bcopy bindresvport_sa clock fchmod fchown freeaddrinfo futimes \
676 gai_strerror getaddrinfo getcwd getgrouplist getnameinfo getopt \ 676 gai_strerror getaddrinfo getcwd getgrouplist getnameinfo getopt \
677 getpeereid _getpty getrlimit getrusage getttyent glob inet_aton \ 677 getpeereid _getpty getrlimit getttyent glob inet_aton \
678 inet_ntoa inet_ntop innetgr login_getcapbool md5_crypt memmove \ 678 inet_ntoa inet_ntop innetgr login_getcapbool md5_crypt memmove \
679 mkdtemp mmap ngetaddrinfo nsleep ogetaddrinfo openlog_r openpty \ 679 mkdtemp mmap ngetaddrinfo nsleep ogetaddrinfo openlog_r openpty \
680 pstat readpassphrase realpath recvmsg rresvport_af sendmsg \ 680 pstat readpassphrase realpath recvmsg rresvport_af sendmsg \
@@ -688,8 +688,9 @@ AC_CHECK_FUNCS(\
688AC_SEARCH_LIBS(nanosleep, rt posix4, AC_DEFINE(HAVE_NANOSLEEP)) 688AC_SEARCH_LIBS(nanosleep, rt posix4, AC_DEFINE(HAVE_NANOSLEEP))
689AC_SEARCH_LIBS(basename, gen, AC_DEFINE(HAVE_BASENAME)) 689AC_SEARCH_LIBS(basename, gen, AC_DEFINE(HAVE_BASENAME))
690 690
691dnl Make sure strsep prototype is defined before defining HAVE_STRSEP 691dnl Make sure prototypes are defined for these before using them.
692AC_CHECK_DECL(strsep, [AC_CHECK_FUNCS(strsep)]) 692AC_CHECK_DECL(strsep, [AC_CHECK_FUNCS(strsep)])
693AC_CHECK_DECL(getrusage, [AC_CHECK_FUNCS(getrusage)])
693 694
694dnl IRIX and Solaris 2.5.1 have dirname() in libgen 695dnl IRIX and Solaris 2.5.1 have dirname() in libgen
695AC_CHECK_FUNCS(dirname, [AC_CHECK_HEADERS(libgen.h)] ,[ 696AC_CHECK_FUNCS(dirname, [AC_CHECK_HEADERS(libgen.h)] ,[