- (tim) [configure.ac] Bug #1149. Changes in QNX section only. Patch by

   kraai at ftbfs.org.

2 files changed, 7 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 10fea4e89..61faee92e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20060205
  - (tim) [configure.ac] Add AC_REVISION. Add sys/time.h to lastlog.h test
    for Solaris. OK dtucker@.
+ - (tim) [configure.ac] Bug #1149. Changes in QNX section only. Patch by
+   kraai at ftbfs.org.
 
 20060203
  - (tim) [configure.ac] test for egrep (AC_PROG_EGREP) before first
@@ -3834,4 +3836,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.4121 2006/02/05 01:33:55 tim Exp $
+$Id: ChangeLog,v 1.4122 2006/02/05 01:42:58 tim Exp $
diff --git a/configure.ac b/configure.ac
index d64daf219..8c6551453 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.325 2006/02/05 01:33:55 tim Exp $
+# $Id: configure.ac,v 1.326 2006/02/05 01:42:58 tim 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.325 $)
+AC_REVISION($Revision: 1.326 $)
 AC_CONFIG_SRCDIR([ssh.c])
 
 AC_CONFIG_HEADER(config.h)
@@ -577,12 +577,13 @@ mips-sony-bsd|mips-sony-newsos4)
         AC_DEFINE(BROKEN_SETREGID)
         ;;
 
-*-*-nto-qnx)
+*-*-nto-qnx*)
         AC_DEFINE(USE_PIPES)
         AC_DEFINE(NO_X11_UNIX_SOCKETS)
         AC_DEFINE(MISSING_NFDBITS, 1, [Define on *nto-qnx systems])
         AC_DEFINE(MISSING_HOWMANY, 1, [Define on *nto-qnx systems])
         AC_DEFINE(MISSING_FD_MASK, 1, [Define on *nto-qnx systems])
+        AC_DEFINE(DISABLE_LASTLOG)
         ;;
 
 *-*-ultrix*)