diff options
author | Darren Tucker <dtucker@zip.com.au> | 2004-08-29 17:04:50 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2004-08-29 17:04:50 +1000 |
commit | 48d99d36bb427f6c43cfe8d8e7d8a457897dfd53 (patch) | |
tree | b217c6c5f2b2456e8ad6e9e629dbd236e4edfe68 | |
parent | 0f56ed16b8e463e16c3a8f78544943a9e6f8ea1f (diff) |
- (dtucker) [configure.ac] Include sys/stream.h in sys/ptms.h header check,
fixes configure warning on Solaris reported by wknox at mitre.org.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | configure.ac | 11 |
2 files changed, 12 insertions, 3 deletions
@@ -23,6 +23,8 @@ | |||
23 | [sshd.c] | 23 | [sshd.c] |
24 | don't erroneously close stdin for !reexec case, from Dave Johnson; | 24 | don't erroneously close stdin for !reexec case, from Dave Johnson; |
25 | ok markus@ | 25 | ok markus@ |
26 | - (dtucker) [configure.ac] Include sys/stream.h in sys/ptms.h header check, | ||
27 | fixes configure warning on Solaris reported by wknox at mitre.org. | ||
26 | 28 | ||
27 | 20040828 | 29 | 20040828 |
28 | - (dtucker) [openbsd-compat/mktemp.c] Remove superfluous Cygwin #ifdef; from | 30 | - (dtucker) [openbsd-compat/mktemp.c] Remove superfluous Cygwin #ifdef; from |
@@ -1690,4 +1692,4 @@ | |||
1690 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1692 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1691 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1693 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1692 | 1694 | ||
1693 | $Id: ChangeLog,v 1.3528 2004/08/29 06:38:41 dtucker Exp $ | 1695 | $Id: ChangeLog,v 1.3529 2004/08/29 07:04:50 dtucker Exp $ |
diff --git a/configure.ac b/configure.ac index 36c457728..b89d2fa25 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.226 2004/08/16 13:12:06 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.227 2004/08/29 07:04:50 dtucker Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -525,10 +525,17 @@ AC_CHECK_HEADERS(bstring.h crypt.h dirent.h endian.h features.h \ | |||
525 | rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \ | 525 | rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \ |
526 | strings.h sys/dir.h sys/strtio.h sys/audit.h sys/bitypes.h \ | 526 | strings.h sys/dir.h sys/strtio.h sys/audit.h sys/bitypes.h \ |
527 | sys/bsdtty.h sys/cdefs.h sys/mman.h sys/ndir.h sys/prctl.h \ | 527 | sys/bsdtty.h sys/cdefs.h sys/mman.h sys/ndir.h sys/prctl.h \ |
528 | sys/pstat.h sys/ptms.h sys/select.h sys/stat.h sys/stream.h \ | 528 | sys/pstat.h sys/select.h sys/stat.h sys/stream.h \ |
529 | sys/stropts.h sys/sysmacros.h sys/time.h sys/timers.h sys/un.h \ | 529 | sys/stropts.h sys/sysmacros.h sys/time.h sys/timers.h sys/un.h \ |
530 | time.h tmpdir.h ttyent.h usersec.h util.h utime.h utmp.h utmpx.h vis.h) | 530 | time.h tmpdir.h ttyent.h usersec.h util.h utime.h utmp.h utmpx.h vis.h) |
531 | 531 | ||
532 | # sys/ptms.h requires sys/stream.h to be included first on Solaris | ||
533 | AC_CHECK_HEADERS(sys/ptms.h, [], [], [ | ||
534 | #ifdef HAVE_SYS_STREAM_H | ||
535 | # include <sys/stream.h> | ||
536 | #endif | ||
537 | ]) | ||
538 | |||
532 | # Checks for libraries. | 539 | # Checks for libraries. |
533 | AC_CHECK_FUNC(yp_match, , AC_CHECK_LIB(nsl, yp_match)) | 540 | AC_CHECK_FUNC(yp_match, , AC_CHECK_LIB(nsl, yp_match)) |
534 | AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt)) | 541 | AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt)) |