diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2003-08-21 16:16:21 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2003-08-21 16:16:21 +1000 |
| commit | a5d45a4cd3d1c7d61f58383922ca3b4bd3864a6b (patch) | |
| tree | 6891be989b314cc225b08ef027ad9f7246302f3e | |
| parent | a982aceea3c800ff4b54832695b5426ce2f1d792 (diff) | |
- (dtucker) [configure.ac] Bug #600: Check that getrusage is declared before
searching libraries for it. Fixes build errors on NCR MP-RAS.
- (dtucker) [configure.ac] Define STREAMS_PUSH_ACQUIRES_CTTY for NCR MP-RAS
and Reliant Unix. Fixes "can't set controlling tty errors".
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 9 |
2 files changed, 11 insertions, 4 deletions
@@ -3,6 +3,10 @@ Remove temp data files from cvs. - (dtucker) [sshd.c] Bug #529: sshd doesn't work correctly after SIGHUP (copy argv correctly), fix by djm from -current. + - (dtucker) [configure.ac] Bug #600: Check that getrusage is declared before + searching libraries for it. Fixes build errors on NCR MP-RAS. + - (dtucker) [configure.ac] Define STREAMS_PUSH_ACQUIRES_CTTY for NCR MP-RAS + and Reliant Unix. Fixes "can't set controlling tty errors". 20030429 - (djm) Add back radix.o (used by AFS support), after it went missing from @@ -1308,4 +1312,4 @@ save auth method before monitor_reset_key_state(); bugzilla bug #284; ok provos@ -$Id: ChangeLog,v 1.2648.2.3 2003/08/21 06:11:30 dtucker Exp $ +$Id: ChangeLog,v 1.2648.2.4 2003/08/21 06:16:21 dtucker Exp $ diff --git a/configure.ac b/configure.ac index e5a8d6f0..6ba2af6f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.113.2.1 2003/04/29 09:12:08 djm Exp $ +# $Id: configure.ac,v 1.113.2.2 2003/08/21 06:16:21 dtucker Exp $ AC_INIT AC_CONFIG_SRCDIR([ssh.c]) @@ -247,6 +247,7 @@ mips-sony-bsd|mips-sony-newsos4) LDFLAGS="$LDFLAGS -L/usr/local/lib" LIBS="$LIBS -lc89" AC_DEFINE(USE_PIPES) + AC_DEFINE(STREAMS_PUSH_ACQUIRES_CTTY) ;; *-sni-sysv*) CPPFLAGS="$CPPFLAGS -I/usr/local/include" @@ -255,6 +256,7 @@ mips-sony-bsd|mips-sony-newsos4) IPADDR_IN_DISPLAY=yes AC_DEFINE(USE_PIPES) AC_DEFINE(IP_TOS_IS_BROKEN) + AC_DEFINE(STREAMS_PUSH_ACQUIRES_CTTY) # /usr/ucblib/libucb.a no longer needed on ReliantUNIX # Attention: always take care to bind libsocket and libnsl before libc, # otherwise you will find lots of "SIOCGPGRP errno 22" on syslog @@ -611,7 +613,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 openpty pstat \ readpassphrase realpath recvmsg rresvport_af sendmsg setdtablesize \ @@ -624,8 +626,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)] ,[ |