summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac10
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 7e8392a43..1f11e32bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
2 - (dtucker) [configure.ac defines.h] Only define SHUT_RD (and friends) and 2 - (dtucker) [configure.ac defines.h] Only define SHUT_RD (and friends) and
3 O_NONBLOCK if they're really needed. Fixes build errors on HP-UX, old 3 O_NONBLOCK if they're really needed. Fixes build errors on HP-UX, old
4 Linuxes and probably more. 4 Linuxes and probably more.
5 - (dtucker) [configure.ac] OpenBSD needs <sys/types.h> before <sys/socket.h>
6 for SHUT_RD.
5 7
620060711 820060711
7 - (dtucker) [configure.ac ssh-keygen.c openbsd-compat/bsd-openpty.c 9 - (dtucker) [configure.ac ssh-keygen.c openbsd-compat/bsd-openpty.c
@@ -4851,4 +4853,4 @@
4851 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4853 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4852 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4854 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4853 4855
4854$Id: ChangeLog,v 1.4389 2006/07/12 09:01:29 dtucker Exp $ 4856$Id: ChangeLog,v 1.4390 2006/07/12 09:02:56 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 19446b3bd..3373dadc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.346 2006/07/12 04:14:31 dtucker Exp $ 1# $Id: configure.ac,v 1.347 2006/07/12 09:02:57 dtucker Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -15,7 +15,7 @@
15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 16
17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) 17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
18AC_REVISION($Revision: 1.346 $) 18AC_REVISION($Revision: 1.347 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -1285,7 +1285,11 @@ AC_CHECK_DECL(tcsendbreak,
1285 1285
1286AC_CHECK_DECLS(h_errno, , ,[#include <netdb.h>]) 1286AC_CHECK_DECLS(h_errno, , ,[#include <netdb.h>])
1287 1287
1288AC_CHECK_DECLS(SHUT_RD, , ,[#include <sys/socket.h>]) 1288AC_CHECK_DECLS(SHUT_RD, , ,
1289 [
1290#include <sys/types.h>
1291#include <sys/socket.h>
1292 ])
1289 1293
1290AC_CHECK_DECLS(O_NONBLOCK, , , 1294AC_CHECK_DECLS(O_NONBLOCK, , ,
1291 [ 1295 [