summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2013-12-19 11:00:12 +1100
committerDarren Tucker <dtucker@zip.com.au>2013-12-19 11:00:12 +1100
commit1fcec9d4f265e38af248c4c845986ca8c174bd68 (patch)
tree55da08d69f711f25fb9eeb886c864bb725ecb292
parent6674eb9683afd1ea4eb35670b5e66815543a759e (diff)
- (dtucker) [configure.ac] bz#2178: Don't try to use BSM on Solaris versions
greater than 11 either rather than just 11. Patch from Tomas Kuthan.
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a8d892f6d..092344a41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120131219
2 - (dtucker) [configure.ac] bz#2178: Don't try to use BSM on Solaris versions
3 greater than 11 either rather than just 11. Patch from Tomas Kuthan.
4
120131218 520131218
2 - (djm) OpenBSD CVS Sync 6 - (djm) OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2013/12/07 08:08:26 7 - djm@cvs.openbsd.org 2013/12/07 08:08:26
diff --git a/configure.ac b/configure.ac
index c8d4bfc6b..d37a211ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.546 2013/12/07 00:51:51 djm Exp $ 1# $Id: configure.ac,v 1.547 2013/12/19 00:00:12 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.546 $) 18AC_REVISION($Revision: 1.547 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20AC_LANG([C]) 20AC_LANG([C])
21 21
@@ -1501,7 +1501,7 @@ AC_ARG_WITH([audit],
1501 # These are optional 1501 # These are optional
1502 AC_CHECK_FUNCS([getaudit_addr aug_get_machine]) 1502 AC_CHECK_FUNCS([getaudit_addr aug_get_machine])
1503 AC_DEFINE([USE_BSM_AUDIT], [1], [Use BSM audit module]) 1503 AC_DEFINE([USE_BSM_AUDIT], [1], [Use BSM audit module])
1504 if test "$sol2ver" -eq 11; then 1504 if test "$sol2ver" -ge 11; then
1505 SSHDLIBS="$SSHDLIBS -lscf" 1505 SSHDLIBS="$SSHDLIBS -lscf"
1506 AC_DEFINE([BROKEN_BSM_API], [1], 1506 AC_DEFINE([BROKEN_BSM_API], [1],
1507 [The system has incomplete BSM API]) 1507 [The system has incomplete BSM API])