diff options
author | Damien Miller <djm@mindrot.org> | 2014-01-25 13:16:59 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-01-25 13:16:59 +1100 |
commit | 603b8f47f1cd9ed95a2017447db8e60ca6704594 (patch) | |
tree | 1c2f01fb2b59a07933e9adec2154fe3c1720ffed /configure.ac | |
parent | c96d85376d779b6ac61525b5440010d344d2f23f (diff) |
- (djm) [configure.ac] autoconf sets finds to 'yes' not '1', so test
against the correct thing.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 6bf30e82c..5e5e4d135 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.561 2014/01/25 02:12:29 djm Exp $ | 1 | # $Id: configure.ac,v 1.562 2014/01/25 02:16:59 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 | ||
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.561 $) | 18 | AC_REVISION($Revision: 1.562 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | AC_LANG([C]) | 20 | AC_LANG([C]) |
21 | 21 | ||
@@ -3033,11 +3033,11 @@ elif test "x$sandbox_arg" = "xseccomp_filter" || \ | |||
3033 | AC_DEFINE([SANDBOX_SECCOMP_FILTER], [1], [Sandbox using seccomp filter]) | 3033 | AC_DEFINE([SANDBOX_SECCOMP_FILTER], [1], [Sandbox using seccomp filter]) |
3034 | elif test "x$sandbox_arg" = "xcapsicum" || \ | 3034 | elif test "x$sandbox_arg" = "xcapsicum" || \ |
3035 | ( test -z "$sandbox_arg" && \ | 3035 | ( test -z "$sandbox_arg" && \ |
3036 | test "x$ac_cv_header_sys_capability_h" = "x1" && \ | 3036 | test "x$ac_cv_header_sys_capability_h" = "xyes" && \ |
3037 | test "x$ac_cv_func_cap_rights_limit" = "x1") ; then | 3037 | test "x$ac_cv_func_cap_rights_limit" = "xyes") ; then |
3038 | test "x$ac_cv_header_sys_capability_h" != "x1" && \ | 3038 | test "x$ac_cv_header_sys_capability_h" != "xyes" && \ |
3039 | AC_MSG_ERROR([capsicum sandbox requires sys/capability.h header]) | 3039 | AC_MSG_ERROR([capsicum sandbox requires sys/capability.h header]) |
3040 | test "x$ac_cv_func_cap_rights_limit" != "x1" && \ | 3040 | test "x$ac_cv_func_cap_rights_limit" != "xyes" && \ |
3041 | AC_MSG_ERROR([capsicum sandbox requires cap_rights_limit function]) | 3041 | AC_MSG_ERROR([capsicum sandbox requires cap_rights_limit function]) |
3042 | SANDBOX_STYLE="capsicum" | 3042 | SANDBOX_STYLE="capsicum" |
3043 | AC_DEFINE([SANDBOX_CAPSICUM], [1], [Sandbox using capsicum]) | 3043 | AC_DEFINE([SANDBOX_CAPSICUM], [1], [Sandbox using capsicum]) |