summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac40
2 files changed, 42 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 730cdd92c..635c4cd0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
120120316
2 - (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
4 des.no
5
120120312 620120312
2 - (dtucker) [regress/Makefile regress/cipher-speed.sh regress/test-exec.sh] 7 - (dtucker) [regress/Makefile regress/cipher-speed.sh regress/test-exec.sh]
3 Improve portability of cipher-speed test, based mostly on a patch from 8 Improve portability of cipher-speed test, based mostly on a patch from
diff --git a/configure.ac b/configure.ac
index a49de84e1..bf161b257 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.514 2013/03/12 00:31:05 dtucker Exp $ 1# $Id: configure.ac,v 1.515 2013/03/14 23:23:07 djm 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.514 $) 18AC_REVISION($Revision: 1.515 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20AC_LANG([C]) 20AC_LANG([C])
21 21
@@ -4439,7 +4439,6 @@ if test -n "$conf_wtmp_location"; then
4439 [Define if you want to specify the path to your wtmp file]) 4439 [Define if you want to specify the path to your wtmp file])
4440fi 4440fi
4441 4441
4442
4443dnl wtmpx detection 4442dnl wtmpx detection
4444AC_MSG_CHECKING([if your system defines WTMPX_FILE]) 4443AC_MSG_CHECKING([if your system defines WTMPX_FILE])
4445AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ 4444AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
@@ -4471,6 +4470,41 @@ if test ! -z "$blibpath" ; then
4471 AC_MSG_WARN([Please check and edit blibpath in LDFLAGS in Makefile]) 4470 AC_MSG_WARN([Please check and edit blibpath in LDFLAGS in Makefile])
4472fi 4471fi
4473 4472
4473AC_CHECK_MEMBER([struct lastlog.ll_line], [], [
4474 AC_DEFINE([DISABLE_LASTLOG])
4475 ], [
4476#ifdef HAVE_SYS_TYPES_H
4477#include <sys/types.h>
4478#endif
4479#ifdef HAVE_UTMP_H
4480#include <utmp.h>
4481#endif
4482#ifdef HAVE_UTMPX_H
4483#include <utmpx.h>
4484#endif
4485#ifdef HAVE_LASTLOG_H
4486#include <lastlog.h>
4487#endif
4488 ])
4489
4490AC_CHECK_MEMBER([struct utmp.ut_line], [], [
4491 AC_DEFINE([DISABLE_UTMP])
4492 AC_DEFINE([DISABLE_WTMP])
4493 ], [
4494#ifdef HAVE_SYS_TYPES_H
4495#include <sys/types.h>
4496#endif
4497#ifdef HAVE_UTMP_H
4498#include <utmp.h>
4499#endif
4500#ifdef HAVE_UTMPX_H
4501#include <utmpx.h>
4502#endif
4503#ifdef HAVE_LASTLOG_H
4504#include <lastlog.h>
4505#endif
4506 ])
4507
4474dnl Adding -Werror to CFLAGS early prevents configure tests from running. 4508dnl Adding -Werror to CFLAGS early prevents configure tests from running.
4475dnl Add now. 4509dnl Add now.
4476CFLAGS="$CFLAGS $werror_flags" 4510CFLAGS="$CFLAGS $werror_flags"