diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2013-06-03 02:03:25 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2013-06-03 02:03:25 +1000 |
| commit | 898ac935e56a7ac5d8b686c590fdb8b7aca27e59 (patch) | |
| tree | 2fd60073985e6d6a7b3c512a2e64518fb37b1127 | |
| parent | ef4901c3eb98c7ab1342c3cd8f2638da1f4b0678 (diff) | |
- (dtucker) [configure.ac] bz#2111: don't try to use lastlog on Android.
Patch from Nathan Osman.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 8 |
2 files changed, 9 insertions, 3 deletions
@@ -9,7 +9,9 @@ [ssh-agent.c] Make parent_alive_interval time_t to avoid signed/unsigned comparison - (dtucker) [configure.ac] sys/un.h needs sys/socket.h on some platforms - to prevent noise from configure. Patch from Nathan Osman. + to prevent noise from configure. Patch from Nathan Osman. (bz#2114). + - (dtucker) [configure.ac] bz#2111: don't try to use lastlog on Android. + Patch from Nathan Osman. 20130601 - (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to diff --git a/configure.ac b/configure.ac index 13524272..d6c57864 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.529 2013/06/02 15:59:13 dtucker Exp $ +# $Id: configure.ac,v 1.530 2013/06/02 16:03:26 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.529 $) +AC_REVISION($Revision: 1.530 $) AC_CONFIG_SRCDIR([ssh.c]) AC_LANG([C]) @@ -491,6 +491,10 @@ case "$host" in AC_DEFINE([PTY_ZEROREAD], [1], [read(1) can return 0 for a non-closed fd]) AC_DEFINE([PLATFORM_SYS_DIR_UID], 2, [System dirs owned by bin (uid 2)]) ;; +*-*-android*) + AC_DEFINE([DISABLE_UTMP], [1], [Define if you don't want to use utmp]) + AC_DEFINE([DISABLE_WTMP], [1], [Define if you don't want to use wtmp]) + ;; *-*-cygwin*) check_for_libcrypt_later=1 LIBS="$LIBS /usr/lib/textreadmode.o" |