summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac8
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index aaba117bf..329560a68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,7 +9,9 @@
9 [ssh-agent.c] 9 [ssh-agent.c]
10 Make parent_alive_interval time_t to avoid signed/unsigned comparison 10 Make parent_alive_interval time_t to avoid signed/unsigned comparison
11 - (dtucker) [configure.ac] sys/un.h needs sys/socket.h on some platforms 11 - (dtucker) [configure.ac] sys/un.h needs sys/socket.h on some platforms
12 to prevent noise from configure. Patch from Nathan Osman. 12 to prevent noise from configure. Patch from Nathan Osman. (bz#2114).
13 - (dtucker) [configure.ac] bz#2111: don't try to use lastlog on Android.
14 Patch from Nathan Osman.
13 15
1420130601 1620130601
15 - (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to 17 - (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to
diff --git a/configure.ac b/configure.ac
index 135242721..d6c57864c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.529 2013/06/02 15:59:13 dtucker Exp $ 1# $Id: configure.ac,v 1.530 2013/06/02 16:03:26 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.529 $) 18AC_REVISION($Revision: 1.530 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20AC_LANG([C]) 20AC_LANG([C])
21 21
@@ -491,6 +491,10 @@ case "$host" in
491 AC_DEFINE([PTY_ZEROREAD], [1], [read(1) can return 0 for a non-closed fd]) 491 AC_DEFINE([PTY_ZEROREAD], [1], [read(1) can return 0 for a non-closed fd])
492 AC_DEFINE([PLATFORM_SYS_DIR_UID], 2, [System dirs owned by bin (uid 2)]) 492 AC_DEFINE([PLATFORM_SYS_DIR_UID], 2, [System dirs owned by bin (uid 2)])
493 ;; 493 ;;
494*-*-android*)
495 AC_DEFINE([DISABLE_UTMP], [1], [Define if you don't want to use utmp])
496 AC_DEFINE([DISABLE_WTMP], [1], [Define if you don't want to use wtmp])
497 ;;
494*-*-cygwin*) 498*-*-cygwin*)
495 check_for_libcrypt_later=1 499 check_for_libcrypt_later=1
496 LIBS="$LIBS /usr/lib/textreadmode.o" 500 LIBS="$LIBS /usr/lib/textreadmode.o"