2 files changed, 9 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 339568ddd..cdbf5d737 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -271,6 +271,7 @@
  - (djm) [includes.h] Put back paths.h, it is needed in defines.h
  - (dtucker) [openbsd-compat/openbsd-compat.h] AIX (at least) needs
    sys/ioctl.h for struct winsize.
+ - (dtucker) [configure.ac] login_cap.h requires sys/types.h on NetBSD.
 
 20060313
  - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -4172,4 +4173,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4223 2006/03/15 11:25:54 dtucker Exp $
+$Id: ChangeLog,v 1.4224 2006/03/15 11:28:17 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 72577a728..f8faa2660 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.336 2006/03/15 10:31:39 dtucker Exp $
+# $Id: configure.ac,v 1.337 2006/03/15 11:28:17 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
-AC_REVISION($Revision: 1.336 $)
+AC_REVISION($Revision: 1.337 $)
 AC_CONFIG_SRCDIR([ssh.c])
 
 AC_CONFIG_HEADER(config.h)
@@ -679,7 +679,6 @@ AC_CHECK_HEADERS( \
         iaf.h \
         limits.h \
         login.h \
-        login_cap.h \
         maillock.h \
         ndir.h \
         netdb.h \
@@ -740,6 +739,11 @@ AC_CHECK_HEADERS(sys/ptms.h, [], [], [
 #endif
 ])
 
+# login_cap.h requires sys/types.h on NetBSD
+AC_CHECK_HEADERS(login_cap.h, [], [], [
+#include <sys/types.h>
+])
+
 # Checks for libraries.
 AC_CHECK_FUNC(yp_match, , AC_CHECK_LIB(nsl, yp_match))
 AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))