diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | configure.ac | 7 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20120317 | ||
2 | - (tim) [configure.ac] OpenServer 5 wants lastlog even though it has none | ||
3 | of the bits the configure test looks for. | ||
4 | |||
1 | 20120316 | 5 | 20120316 |
2 | - (djm) [configure.ac] Disable utmp, wtmp and/or lastlog if the platform | 6 | - (djm) [configure.ac] Disable utmp, wtmp and/or lastlog if the platform |
3 | is unable to successfully compile them. Based on patch from des AT | 7 | is unable to successfully compile them. Based on patch from des AT |
diff --git a/configure.ac b/configure.ac index 907192d60..5d835c93d 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.516 2013/03/14 23:34:25 djm Exp $ | 1 | # $Id: configure.ac,v 1.517 2013/03/17 03:55:47 tim 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 | ||
17 | AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) | 17 | AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) |
18 | AC_REVISION($Revision: 1.516 $) | 18 | AC_REVISION($Revision: 1.517 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | AC_LANG([C]) | 20 | AC_LANG([C]) |
21 | 21 | ||
@@ -897,6 +897,7 @@ mips-sony-bsd|mips-sony-newsos4) | |||
897 | AC_CHECK_FUNCS([getluid setluid]) | 897 | AC_CHECK_FUNCS([getluid setluid]) |
898 | MANTYPE=man | 898 | MANTYPE=man |
899 | TEST_SHELL=ksh | 899 | TEST_SHELL=ksh |
900 | SKIP_DISABLE_LASTLOG_DEFINE=yes | ||
900 | ;; | 901 | ;; |
901 | *-*-unicosmk*) | 902 | *-*-unicosmk*) |
902 | AC_DEFINE([NO_SSH_LASTLOG], [1], | 903 | AC_DEFINE([NO_SSH_LASTLOG], [1], |
@@ -4472,7 +4473,9 @@ if test ! -z "$blibpath" ; then | |||
4472 | fi | 4473 | fi |
4473 | 4474 | ||
4474 | AC_CHECK_MEMBER([struct lastlog.ll_line], [], [ | 4475 | AC_CHECK_MEMBER([struct lastlog.ll_line], [], [ |
4476 | if test x$SKIP_DISABLE_LASTLOG_DEFINE != "xyes" ; then | ||
4475 | AC_DEFINE([DISABLE_LASTLOG]) | 4477 | AC_DEFINE([DISABLE_LASTLOG]) |
4478 | fi | ||
4476 | ], [ | 4479 | ], [ |
4477 | #ifdef HAVE_SYS_TYPES_H | 4480 | #ifdef HAVE_SYS_TYPES_H |
4478 | #include <sys/types.h> | 4481 | #include <sys/types.h> |