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 | |
| parent | c96d85376d779b6ac61525b5440010d344d2f23f (diff) | |
- (djm) [configure.ac] autoconf sets finds to 'yes' not '1', so test
against the correct thing.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | configure.ac | 12 |
2 files changed, 8 insertions, 6 deletions
@@ -4,6 +4,8 @@ sys/capability.h exists and cap_rights_limit is in libc. Fixes build on FreeBSD9x which provides the header but not the libc support. + - (djm) [configure.ac] autoconf sets finds to 'yes' not '1', so test + against the correct thing. 20130124 - (djm) [Makefile.in regress/scp-ssh-wrapper.sh regress/scp.sh] Make diff --git a/configure.ac b/configure.ac index 6bf30e82..5e5e4d13 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.561 2014/01/25 02:12:29 djm Exp $ +# $Id: configure.ac,v 1.562 2014/01/25 02:16:59 djm Exp $ # # Copyright (c) 1999-2004 Damien Miller # @@ -15,7 +15,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) -AC_REVISION($Revision: 1.561 $) +AC_REVISION($Revision: 1.562 $) AC_CONFIG_SRCDIR([ssh.c]) AC_LANG([C]) @@ -3033,11 +3033,11 @@ elif test "x$sandbox_arg" = "xseccomp_filter" || \ AC_DEFINE([SANDBOX_SECCOMP_FILTER], [1], [Sandbox using seccomp filter]) elif test "x$sandbox_arg" = "xcapsicum" || \ ( test -z "$sandbox_arg" && \ - test "x$ac_cv_header_sys_capability_h" = "x1" && \ - test "x$ac_cv_func_cap_rights_limit" = "x1") ; then - test "x$ac_cv_header_sys_capability_h" != "x1" && \ + test "x$ac_cv_header_sys_capability_h" = "xyes" && \ + test "x$ac_cv_func_cap_rights_limit" = "xyes") ; then + test "x$ac_cv_header_sys_capability_h" != "xyes" && \ AC_MSG_ERROR([capsicum sandbox requires sys/capability.h header]) - test "x$ac_cv_func_cap_rights_limit" != "x1" && \ + test "x$ac_cv_func_cap_rights_limit" != "xyes" && \ AC_MSG_ERROR([capsicum sandbox requires cap_rights_limit function]) SANDBOX_STYLE="capsicum" AC_DEFINE([SANDBOX_CAPSICUM], [1], [Sandbox using capsicum]) |