- (djm) [configure.ac] autoconf sets finds to 'yes' not '1', so test

   against the correct thing.

diff --git a/ChangeLog b/ChangeLog
index 9dc664e5788a936867034eba2c9c3a18c98eb935..44e56f4a6dc314b266da840e70df96f43e100cc3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 6bf30e82c585e2e276ea9d08afa401659dda78b3..5e5e4d135370bad5b92bca9524f088591f35b768 100644 (file)
--- 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])