summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac15
2 files changed, 13 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index a89bb4b5a..fc7fad995 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120120419
2 - (djm) [configure.ac] Fix compilation error on FreeBSD, whose libutil
3 contains openpty() but not login()
4
120120404 520120404
2 - (djm) [Makefile.in configure.ac sandbox-seccomp-filter.c] Add sandbox 6 - (djm) [Makefile.in configure.ac sandbox-seccomp-filter.c] Add sandbox
3 mode for Linux's new seccomp filter; patch from Will Drewry; feedback 7 mode for Linux's new seccomp filter; patch from Will Drewry; feedback
diff --git a/configure.ac b/configure.ac
index 23ac1490a..1457b8a89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.488 2012/04/04 01:27:57 djm Exp $ 1# $Id: configure.ac,v 1.489 2012/04/19 11:46:38 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.488 $) 18AC_REVISION($Revision: 1.489 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20AC_LANG([C]) 20AC_LANG([C])
21 21
@@ -1170,9 +1170,13 @@ AC_CHECK_FUNCS([utimes],
1170 1170
1171dnl Checks for libutil functions 1171dnl Checks for libutil functions
1172AC_CHECK_HEADERS([libutil.h]) 1172AC_CHECK_HEADERS([libutil.h])
1173AC_SEARCH_LIBS([login], [util bsd], [AC_DEFINE([HAVE_LOGIN], [1], 1173AC_SEARCH_LIBS([fmt_scaled], [util bsd])
1174 [Define if your libraries define login()])]) 1174AC_SEARCH_LIBS([login], [util bsd])
1175AC_CHECK_FUNCS([fmt_scaled logout updwtmp logwtmp]) 1175AC_SEARCH_LIBS([logout], [util bsd])
1176AC_SEARCH_LIBS([logwtmp], [util bsd])
1177AC_SEARCH_LIBS([openpty], [util bsd])
1178AC_SEARCH_LIBS([updwtmp], [util bsd])
1179AC_CHECK_FUNCS([fmt_scaled login logout openpty updwtmp logwtmp])
1176 1180
1177AC_FUNC_STRFTIME 1181AC_FUNC_STRFTIME
1178 1182
@@ -1552,7 +1556,6 @@ AC_CHECK_FUNCS([ \
1552 nsleep \ 1556 nsleep \
1553 ogetaddrinfo \ 1557 ogetaddrinfo \
1554 openlog_r \ 1558 openlog_r \
1555 openpty \
1556 poll \ 1559 poll \
1557 prctl \ 1560 prctl \
1558 pstat \ 1561 pstat \