Changeset 1993 for xz/vendor/current/configure

Timestamp:

Feb 8, 2017, 8:58:22 PM (8 years ago)

Author:

Silvan Scherrer

Message:

xz: update vendor to version 5.2.3

File:

• xz/vendor/current/configure (modified) (73 diffs)

xz/vendor/current/configure ¶

@@ -1 +1 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for XZ Utils 5.2.2.
+# Generated by GNU Autoconf 2.69 for XZ Utils 5.2.3.
 #
 # Report bugs to <lasse.collin@tukaani.org>.
@@ -591 +591 @@
 PACKAGE_NAME='XZ Utils'
 PACKAGE_TARNAME='xz'
-PACKAGE_VERSION='5.2.2'
-PACKAGE_STRING='XZ Utils 5.2.2'
+PACKAGE_VERSION='5.2.3'
+PACKAGE_STRING='XZ Utils 5.2.3'
 PACKAGE_BUGREPORT='lasse.collin@tukaani.org'
 PACKAGE_URL='http://tukaani.org/xz/'
@@ -643 +643 @@
 HAVE_VISIBILITY
 CFLAG_VISIBILITY
+CAPSICUM_LIB
 COND_INTERNAL_SHA256_FALSE
 COND_INTERNAL_SHA256_TRUE
@@ -903 +904 @@
 enable_match_finders
 enable_checks
+enable_external_sha256
 enable_assembler
 enable_small
@@ -915 +917 @@
 enable_doc
 enable_symbol_versions
+enable_sandbox
 enable_silent_rules
 enable_dependency_tracking
@@ -1485 +1488 @@
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures XZ Utils 5.2.2 to adapt to many kinds of systems.
+\`configure' configures XZ Utils 5.2.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1555 +1558 @@
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of XZ Utils 5.2.2:";;
+     short | recursive ) echo "Configuration of XZ Utils 5.2.3:";;
    esac
   cat <<\_ACEOF
@@ -1578 +1581 @@
                           Default=all. Available integrity checks: crc32 crc64
                           sha256
+  --enable-external-sha256
+                          Use SHA-256 code from the operating system. See
+                          INSTALL for possible subtle problems.
   --disable-assembler     Do not use assembler optimizations even if such
                           exist for the architecture.
@@ -1605 +1611 @@
                           default on GNU/Linux, other GNU-based systems, and
                           FreeBSD.
+  --enable-sandbox=METHOD This is an experimental feature. Sandboxing METHOD
+                          can be `auto', `no', or `capsicum'. The default is
+                          `no'.
   --enable-silent-rules   less verbose build output (undo: "make V=1")
   --disable-silent-rules  verbose build output (undo: "make V=0")
@@ -1638 +1647 @@
   --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
                           compiler's sysroot if not specified).
-  --with-gnu-ld           assume the C compiler uses GNU ld default=no
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
@@ -1725 +1734 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-XZ Utils configure 5.2.2
+XZ Utils configure 5.2.3
 generated by GNU Autoconf 2.69
 
@@ -2564 +2573 @@
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by XZ Utils $as_me 5.2.2, which was
+It was created by XZ Utils $as_me 5.2.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
@@ -3131 +3140 @@
 enable_encoders=`echo "$enable_encoders" | sed 's/,/ /g'`
 if test "x$enable_encoders" = xno || test "x$enable_encoders" = x; then
+        enable_encoders=no
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: (none)" >&5
 $as_echo "(none)" >&6; }
@@ -3207 +3217 @@
                 esac
         done
+
+$as_echo "#define HAVE_ENCODERS 1" >>confdefs.h
+
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_encoders" >&5
 $as_echo "$enable_encoders" >&6; }
@@ -3222 +3235 @@
 enable_decoders=`echo "$enable_decoders" | sed 's/,/ /g'`
 if test "x$enable_decoders" = xno || test "x$enable_decoders" = x; then
+        enable_decoders=no
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: (none)" >&5
 $as_echo "(none)" >&6; }
@@ -3299 +3313 @@
         done
 
-        # LZMA2 requires that LZMA1 is enabled.
-        test "x$enable_encoder_lzma2" = xyes && enable_encoder_lzma1=yes
-        test "x$enable_decoder_lzma2" = xyes && enable_decoder_lzma1=yes
+$as_echo "#define HAVE_DECODERS 1" >>confdefs.h
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_decoders" >&5
@@ -3312 +3324 @@
 fi
 
- if test "x$enable_encoders" != xno && test "x$enable_encoders" != x; then
+ if test "x$enable_encoders" != xno; then
   COND_MAIN_ENCODER_TRUE=
   COND_MAIN_ENCODER_FALSE='#'
@@ -3320 +3332 @@
 fi
 
- if test "x$enable_decoders" != xno && test "x$enable_decoders" != x; then
+ if test "x$enable_decoders" != xno; then
   COND_MAIN_DECODER_TRUE=
   COND_MAIN_DECODER_FALSE='#'
@@ -3785 +3797 @@
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if external SHA-256 should be used" >&5
+$as_echo_n "checking if external SHA-256 should be used... " >&6; }
+# Check whether --enable-external-sha256 was given.
+if test "${enable_external_sha256+set}" = set; then :
+  enableval=$enable_external_sha256;
+else
+  enable_external_sha256=no
+fi
+
+if test "x$enable_check_sha256" != "xyes"; then
+        enable_external_sha256=no
+fi
+if test "x$enable_external_sha256" = xyes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
 
 ###########################
@@ -3989 +4021 @@
 fi
 
+test "x$enable_decoders" = xno && enable_xzdec=no
  if test x$enable_xzdec != xno; then
   COND_XZDEC_TRUE=
@@ -4005 +4038 @@
 fi
 
+test "x$enable_decoder_lzma1" = xno && enable_lzmadec=no
  if test x$enable_lzmadec != xno; then
   COND_LZMADEC_TRUE=
@@ -4021 +4055 @@
 fi
 
+test "x$enable_decoder_lzma1" = xno && enable_lzmainfo=no
  if test x$enable_lzmainfo != xno; then
   COND_LZMAINFO_TRUE=
@@ -4116 +4151 @@
 fi
 
+
+
+##############
+# Sandboxing #
+##############
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if sandboxing should be used" >&5
+$as_echo_n "checking if sandboxing should be used... " >&6; }
+# Check whether --enable-sandbox was given.
+if test "${enable_sandbox+set}" = set; then :
+  enableval=$enable_sandbox;
+else
+  enable_sandbox=no
+fi
+
+case $enable_sandbox in
+        auto)
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: maybe (autodetect)" >&5
+$as_echo "maybe (autodetect)" >&6; }
+                ;;
+        no | capsicum)
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_sandbox" >&5
+$as_echo "$enable_sandbox" >&6; }
+                ;;
+        *)
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+                as_fn_error $? "--enable-sandbox only accepts \`auto', \`no', or \`capsicum'." "$LINENO" 5
+                ;;
+esac
 
 
@@ -4676 +4741 @@
 # Define the identity of the package.
  PACKAGE='xz'
- VERSION='5.2.2'
+ VERSION='5.2.3'
 
 
@@ -15234 +15299 @@
 
 
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 $as_echo_n "checking whether NLS is requested... " >&6; }
@@ -15256 +15314 @@
 
 
-      GETTEXT_MACRO_VERSION=0.18
+      GETTEXT_MACRO_VERSION=0.19
 
 
@@ -15264 +15322 @@
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
 
@@ -15387 +15444 @@
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
 
@@ -15465 +15521 @@
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
 
@@ -15557 +15612 @@
 
 
+
 # Check whether --with-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then :
@@ -15567 +15623 @@
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
+fi
+
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
-$as_echo_n "checking for ld used by GCC... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
@@ -15591 +15647 @@
   case $ac_prog in
     # Accept absolute paths.
-    [\\/]* | [A-Za-z]:[\\/]*)
+    [\\/]* | ?:[\\/]*)
       re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+      # Canonicalize the pathname of ld
+      ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
+      while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
         ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
       done
@@ -15620 +15676 @@
 else
   if test -z "$LD"; then
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
+    IFS="$acl_save_ifs"
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       acl_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
+      # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+      case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
-        test "$with_gnu_ld" != no && break ;;
+        test "$with_gnu_ld" != no && break
+        ;;
       *)
-        test "$with_gnu_ld" != yes && break ;;
+        test "$with_gnu_ld" != yes && break
+        ;;
       esac
     fi
   done
-  IFS="$ac_save_ifs"
+  IFS="$acl_save_ifs"
 else
   acl_cv_path_LD="$LD" # Let the user override the test with a path.
@@ -15656 +15715 @@
   $as_echo_n "(cached) " >&6
 else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes ;;
+  acl_cv_prog_gnu_ld=yes
+  ;;
 *)
-  acl_cv_prog_gnu_ld=no ;;
+  acl_cv_prog_gnu_ld=no
+  ;;
 esac
 fi
@@ -15844 +15905 @@
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
@@ -16373 +16434 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;
+
 int
 main ()
 {
+
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+
   ;
   return 0;
@@ -16439 +16504 @@
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <stdlib.h>
 #include <iconv.h>
+
 int
 main ()
 {
 iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);
+           iconv(cd,NULL,NULL,NULL,NULL);
+           iconv_close(cd);
   ;
   return 0;
@@ -16461 +16528 @@
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <stdlib.h>
 #include <iconv.h>
+
 int
 main ()
 {
 iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);
+             iconv(cd,NULL,NULL,NULL,NULL);
+             iconv_close(cd);
   ;
   return 0;
@@ -16492 +16561 @@
 else
 
-            am_save_LIBS="$LIBS"
+                  am_save_LIBS="$LIBS"
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
       fi
       if test "$cross_compiling" = yes; then :
-  case "$host_os" in
+
+         case "$host_os" in
            aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
            *)            am_cv_func_iconv_works="guessing yes" ;;
          esac
+
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16509 +16580 @@
 int main ()
 {
+  int result = 0;
   /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
      returns.  */
@@ -16525 +16597 @@
                             &outptr, &outbytesleft);
         if (res == 0)
-          return 1;
+          result |= 1;
+        iconv_close (cd_utf8_to_88591);
       }
   }
@@ -16544 +16617 @@
                             &outptr, &outbytesleft);
         if (res == 0)
-          return 1;
+          result |= 2;
+        iconv_close (cd_ascii_to_88591);
+      }
+  }
+  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input[] = "\304";
+        static char buf[2] = { (char)0xDE, (char)0xAD };
+        const char *inptr = input;
+        size_t inbytesleft = 1;
+        char *outptr = buf;
+        size_t outbytesleft = 1;
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
+          result |= 4;
+        iconv_close (cd_88591_to_utf8);
       }
   }
@@ -16563 +16656 @@
                             &outptr, &outbytesleft);
         if ((int)res > 0)
-          return 1;
+          result |= 8;
+        iconv_close (cd_88591_to_utf8);
       }
   }
@@ -16577 +16671 @@
       /* Try HP-UX names.  */
       && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-    return 1;
-  return 0;
+    result |= 16;
+  return result;
 }
 _ACEOF
@@ -16695 +16789 @@
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
@@ -17093 +17187 @@
                         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <libintl.h>
 $gt_revision_test_code
@@ -17101 +17196 @@
 #endif
 const char *_nl_expand_alias (const char *);
+
 int
 main ()
 {
+
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+
   ;
   return 0;
@@ -17121 +17219 @@
               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <libintl.h>
 $gt_revision_test_code
@@ -17129 +17228 @@
 #endif
 const char *_nl_expand_alias (const char *);
+
 int
 main ()
 {
+
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+
   ;
   return 0;
@@ -17140 +17242 @@
 if ac_fn_c_try_link "$LINENO"; then :
   LIBINTL="$LIBINTL $LIBICONV"
-                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                eval "$gt_func_gnugettext_libintl=yes"
+                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                 eval "$gt_func_gnugettext_libintl=yes"
 
 fi
@@ -18103 +18205 @@
 
 # Find the best function to set timestamps.
-for ac_func in futimens futimes futimesat utimes utime
+for ac_func in futimens futimes futimesat utimes _futime utime
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -18598 +18700 @@
 
 
+# glibc-based systems (GNU/Linux and GNU/kFreeBSD) have sched_getaffinity().
+# The CPU_COUNT() macro was added in glibc 2.9 so we try to link the
+# test program instead of merely compiling it. glibc 2.9 is old enough that
+# if someone uses the code on older glibc, the fallback to sysconf() should
+# be good enough.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sched.h>
+int
+main(void)
+{
+        cpu_set_t cpu_mask;
+        sched_getaffinity(0, sizeof(cpu_mask), &cpu_mask);
+        return CPU_COUNT(&cpu_mask);
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  tuklib_cv_cpucores_method=sched_getaffinity
+else
+
+
 # FreeBSD has both cpuset and sysctl. Look for cpuset first because
 # it's a better approach.
+#
+# This test would match on GNU/kFreeBSD too but it would require
+# -lfreebsd-glue when linking and thus in the current form this would
+# fail on GNU/kFreeBSD. The above test for sched_getaffinity() matches
+# on GNU/kFreeBSD so the test below should never run on that OS.
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -18711 +18841 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
@@ -18717 +18850 @@
 
 case $tuklib_cv_cpucores_method in
+        sched_getaffinity)
+
+$as_echo "#define TUKLIB_CPUCORES_SCHED_GETAFFINITY 1" >>confdefs.h
+
+                ;;
         cpuset)
 
@@ -18791 +18929 @@
 
 
-# Check for system-provided SHA-256. At least the following is supported:
+# If requsted, check for system-provided SHA-256. At least the following
+# implementations are supported:
 #
 # OS       Headers                     Library  Type           Function
@@ -18798 +18937 @@
 # OpenBSD  sys/types.h + sha2.h                 SHA2_CTX       SHA256Init
 # Solaris  sys/types.h + sha2.h        libmd    SHA256_CTX     SHA256Init
-# MINIX 3  sys/types.h + minix/sha2.h  libutil  SHA256_CTX     SHA256_Init
+# MINIX 3  sys/types.h + sha2.h                 SHA256_CTX     SHA256_Init
 # Darwin   CommonCrypto/CommonDigest.h          CC_SHA256_CTX  CC_SHA256_Init
 #
@@ -18804 +18943 @@
 # of size_t.
 #
-# We don't check for e.g. OpenSSL or libgcrypt because we don't want
-# to introduce dependencies to other packages by default. Maybe such
-# libraries could be supported via additional configure options though.
-#
-if test "x$enable_check_sha256" = "xyes"; then
+sha256_header_found=no
+sha256_type_found=no
+sha256_func_found=no
+if test "x$enable_external_sha256" = "xyes"; then
         # Test for Common Crypto before others, because Darwin has sha256.h
         # too and we don't want to use that, because on older versions it
         # uses OpenSSL functions, whose SHA256_Init is not guaranteed to
         # succeed.
-        sha256_header_found=no
-        for ac_header in CommonCrypto/CommonDigest.h sha256.h sha2.h minix/sha2.h
+        for ac_header in CommonCrypto/CommonDigest.h sha256.h sha2.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -18840 +18977 @@
                           # include <sha2.h>
                           #endif
-                          #ifdef HAVE_MINIX_SHA2_H
-                          # include <minix/sha2.h>
-                          #endif
 "
 if test "x$ac_cv_type_CC_SHA256_CTX" = xyes; then :
@@ -18850 +18984 @@
 _ACEOF
 
-
+sha256_type_found=yes
 fi
 ac_fn_c_check_type "$LINENO" "SHA256_CTX" "ac_cv_type_SHA256_CTX" "#ifdef HAVE_SYS_TYPES_H
@@ -18864 +18998 @@
                           # include <sha2.h>
                           #endif
-                          #ifdef HAVE_MINIX_SHA2_H
-                          # include <minix/sha2.h>
-                          #endif
 "
 if test "x$ac_cv_type_SHA256_CTX" = xyes; then :
@@ -18874 +19005 @@
 _ACEOF
 
-
+sha256_type_found=yes
 fi
 ac_fn_c_check_type "$LINENO" "SHA2_CTX" "ac_cv_type_SHA2_CTX" "#ifdef HAVE_SYS_TYPES_H
@@ -18888 +19019 @@
                           # include <sha2.h>
                           #endif
-                          #ifdef HAVE_MINIX_SHA2_H
-                          # include <minix/sha2.h>
-                          #endif
 "
 if test "x$ac_cv_type_SHA2_CTX" = xyes; then :
@@ -18898 +19026 @@
 _ACEOF
 
-
-fi
-
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SHA256_Init" >&5
-$as_echo_n "checking for library containing SHA256_Init... " >&6; }
-if ${ac_cv_search_SHA256_Init+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char SHA256_Init ();
-int
-main ()
-{
-return SHA256_Init ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' md util; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_SHA256_Init=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_SHA256_Init+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_SHA256_Init+:} false; then :
-
-else
-  ac_cv_search_SHA256_Init=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SHA256_Init" >&5
-$as_echo "$ac_cv_search_SHA256_Init" >&6; }
-ac_res=$ac_cv_search_SHA256_Init
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SHA256Init" >&5
+sha256_type_found=yes
+fi
+
+                if test "x$sha256_type_found" = xyes ; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SHA256Init" >&5
 $as_echo_n "checking for library containing SHA256Init... " >&6; }
 if ${ac_cv_search_SHA256Init+:} false; then :
@@ -19013 +19086 @@
 fi
 
-                for ac_func in CC_SHA256_Init SHA256_Init SHA256Init
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SHA256_Init" >&5
+$as_echo_n "checking for library containing SHA256_Init... " >&6; }
+if ${ac_cv_search_SHA256_Init+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char SHA256_Init ();
+int
+main ()
+{
+return SHA256_Init ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' md; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_SHA256_Init=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_SHA256_Init+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_SHA256_Init+:} false; then :
+
+else
+  ac_cv_search_SHA256_Init=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SHA256_Init" >&5
+$as_echo "$ac_cv_search_SHA256_Init" >&6; }
+ac_res=$ac_cv_search_SHA256_Init
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+                        for ac_func in CC_SHA256_Init SHA256Init SHA256_Init
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -19021 +19150 @@
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
- break
+ sha256_func_found=yes ; break
 fi
 done
 
+                fi
         fi
 fi
- if test "x$ac_cv_func_SHA256_Init" != xyes \
-                && test "x$ac_cv_func_SHA256Init" != xyes \
-                && test "x$ac_cv_func_CC_SHA256_Init" != xyes; then
+ if test "x$sha256_func_found" = xno; then
   COND_INTERNAL_SHA256_TRUE=
   COND_INTERNAL_SHA256_FALSE='#'
@@ -19037 +19165 @@
 fi
 
+if test "x$enable_external_sha256$sha256_func_found" = xyesno; then
+        as_fn_error $? "--enable-external-sha256 was specified but no supported external SHA-256 implementation was found" "$LINENO" 5
+fi
 
 # Check for SSE2 intrinsics.
@@ -19049 +19180 @@
 fi
 
+
+# Check for sandbox support. If one is found, set enable_sandbox=found.
+case $enable_sandbox in
+        auto | capsicum)
+
+# On FreeBSD >= 11.x and Linux, Capsicum is uses <sys/capsicum.h>.
+# If this header is found, it is assumed to be the right one.
+capsicum_header_found=no
+for ac_header in sys/capsicum.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/capsicum.h" "ac_cv_header_sys_capsicum_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_capsicum_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_CAPSICUM_H 1
+_ACEOF
+ capsicum_header_found=yes
+fi
+
+done
+
+if test "$capsicum_header_found" = no ; then
+    # On FreeBSD 10.x Capsicum uses <sys/capability.h>. Such a header exists
+    # on Linux too but it describes POSIX.1e capabilities. Look for the
+    # declaration of cap_rights_limit to check if <sys/capability.h> is
+    # a Capsicum header.
+    ac_fn_c_check_decl "$LINENO" "cap_rights_limit" "ac_cv_have_decl_cap_rights_limit" "#include <sys/capability.h>
+"
+if test "x$ac_cv_have_decl_cap_rights_limit" = xyes; then :
+  capsicum_header_found=yes
+fi
+
+fi
+
+capsicum_lib_found=no
+CAPSICUM_LIB=
+if test "$capsicum_header_found" = yes ; then
+    ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+    # FreeBSD >= 10.x has Capsicum functions in libc.
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char cap_rights_limit ();
+int
+main ()
+{
+return cap_rights_limit ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  capsicum_lib_found=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    # Linux has Capsicum functions in libcaprights.
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cap_rights_limit in -lcaprights" >&5
+$as_echo_n "checking for cap_rights_limit in -lcaprights... " >&6; }
+if ${ac_cv_lib_caprights_cap_rights_limit+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcaprights  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char cap_rights_limit ();
+int
+main ()
+{
+return cap_rights_limit ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_caprights_cap_rights_limit=yes
+else
+  ac_cv_lib_caprights_cap_rights_limit=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_caprights_cap_rights_limit" >&5
+$as_echo "$ac_cv_lib_caprights_cap_rights_limit" >&6; }
+if test "x$ac_cv_lib_caprights_cap_rights_limit" = xyes; then :
+  CAPSICUM_LIB=-lcaprights
+                  capsicum_lib_found=yes
+fi
+
+    ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+
+
+if test "$capsicum_lib_found" = yes ; then
+
+$as_echo "#define HAVE_CAPSICUM 1" >>confdefs.h
+
+    enable_sandbox=found
+else
+    :
+fi
+                ;;
+esac
+
+# If a specific sandboxing method was explicitly requested and it wasn't
+# found, give an error.
+case $enable_sandbox in
+        auto | no | found)
+                ;;
+        *)
+                as_fn_error $? "$enable_sandbox support not found" "$LINENO" 5
+                ;;
+esac
 
 
@@ -19111 +19379 @@
 /* end confdefs.h.  */
 extern __attribute__((__visibility__("hidden"))) int hiddenvar;
-         extern __attribute__((__visibility__("default"))) int exportedvar;
-         extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
-         extern __attribute__((__visibility__("default"))) int exportedfunc (void);
-         void dummyfunc (void) {}
+             extern __attribute__((__visibility__("default"))) int exportedvar;
+             extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
+             extern __attribute__((__visibility__("default"))) int exportedfunc (void);
+             void dummyfunc (void) {}
+
 int
 main ()
@@ -20010 +20279 @@
 # values after options handling.
 ac_log="
-This file was extended by XZ Utils $as_me 5.2.2, which was
+This file was extended by XZ Utils $as_me 5.2.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
@@ -20077 +20346 @@
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-XZ Utils config.status 5.2.2
+XZ Utils config.status 5.2.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
@@ -21976 +22245 @@
         # Adjust a relative srcdir.
         ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
         ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
         # In autoconf-2.13 it is called $ac_given_srcdir.
@@ -21992 +22261 @@
           rm -f "$ac_dir/POTFILES"
           test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[   ]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+          gt_tab=`printf '\t'`
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
           POMAKEFILEDEPS="POTFILES.in"
           # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
@@ -22003 +22273 @@
             fi
             ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
             eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
             POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
           else
             # The set of available languages was given in configure.in.
-            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
             eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
           fi