From 8ebf4e7079542370a0dd5eba7eed1790d20c7f96 Mon Sep 17 00:00:00 2001 From: joerg Date: Tue, 1 Aug 2017 22:21:09 +0000 Subject: Import libarchive-3.3.2 + 9de5f3 + f9dacbf: - Support NFS4 ACLs on Linux - Bugfixes --- archivers/libarchive/files/configure | 1007 ++++++++++++++++++++++++++-------- 1 file changed, 789 insertions(+), 218 deletions(-) (limited to 'archivers/libarchive/files/configure') diff --git a/archivers/libarchive/files/configure b/archivers/libarchive/files/configure index ff3e9611563..91bee3bde3f 100755 --- a/archivers/libarchive/files/configure +++ b/archivers/libarchive/files/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libarchive 3.3.1. +# Generated by GNU Autoconf 2.69 for libarchive 3.3.2. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libarchive' PACKAGE_TARNAME='libarchive' -PACKAGE_VERSION='3.3.1' -PACKAGE_STRING='libarchive 3.3.1' +PACKAGE_VERSION='3.3.2' +PACKAGE_STRING='libarchive 3.3.2' PACKAGE_BUGREPORT='libarchive-discuss@googlegroups.com' PACKAGE_URL='' @@ -635,6 +635,14 @@ ac_includes_default="\ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS +INC_FREEBSD_ACL_FALSE +INC_FREEBSD_ACL_TRUE +INC_DARWIN_ACL_FALSE +INC_DARWIN_ACL_TRUE +INC_SUNOS_ACL_FALSE +INC_SUNOS_ACL_TRUE +INC_LINUX_ACL_FALSE +INC_LINUX_ACL_TRUE LIBOBJS LIBXML2_PC_LIBS LIBXML2_PC_CFLAGS @@ -809,6 +817,7 @@ with_libiconv_prefix with_lz4 with_lzma with_lzo2 +with_cng with_nettle with_openssl with_xml2 @@ -1383,7 +1392,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libarchive 3.3.1 to adapt to many kinds of systems. +\`configure' configures libarchive 3.3.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1454,7 +1463,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libarchive 3.3.1:";; + short | recursive ) echo "Configuration of libarchive 3.3.2:";; esac cat <<\_ACEOF @@ -1524,6 +1533,7 @@ Optional Packages: --without-lz4 Don't build support for lz4 through liblz4 --without-lzma Don't build support for xz through lzma --with-lzo2 Build with LZO support from liblzo2 + --without-cng Don't build support of CNG(Crypto Next Generation) --without-nettle Don't build with crypto support from Nettle --without-openssl Don't build support for mtree and xar hashes through openssl @@ -1617,7 +1627,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libarchive configure 3.3.1 +libarchive configure 3.3.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2456,7 +2466,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libarchive $as_me 3.3.1, which was +It was created by libarchive $as_me 3.3.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3325,7 +3335,7 @@ fi # Define the identity of the package. PACKAGE='libarchive' - VERSION='3.3.1' + VERSION='3.3.2' cat >>confdefs.h <<_ACEOF @@ -3485,7 +3495,7 @@ AM_BACKSLASH='\' # Libtool interface version bumps on any API change, so increments # whenever libarchive minor version does. -ARCHIVE_MINOR=$(( (3003001 / 1000) % 1000 )) +ARCHIVE_MINOR=$(( (3003002 / 1000) % 1000 )) # Libarchive 2.7 == libtool interface 9 = 2 + 7 # Libarchive 2.8 == libtool interface 10 = 2 + 8 # Libarchive 2.9 == libtool interface 11 = 2 + 8 @@ -3493,37 +3503,37 @@ ARCHIVE_MINOR=$(( (3003001 / 1000) % 1000 )) # Libarchive 3.1 == libtool interface 13 ARCHIVE_INTERFACE=`echo $((13 + ${ARCHIVE_MINOR}))` # Libarchive revision is bumped on any source change === libtool revision -ARCHIVE_REVISION=$(( 3003001 % 1000 )) +ARCHIVE_REVISION=$(( 3003002 % 1000 )) # Libarchive minor is bumped on any interface addition === libtool age ARCHIVE_LIBTOOL_VERSION=$ARCHIVE_INTERFACE:$ARCHIVE_REVISION:$ARCHIVE_MINOR # Stick the version numbers into config.h -$as_echo "#define LIBARCHIVE_VERSION_STRING \"3.3.1\"" >>confdefs.h +$as_echo "#define LIBARCHIVE_VERSION_STRING \"3.3.2\"" >>confdefs.h cat >>confdefs.h <<_ACEOF -#define LIBARCHIVE_VERSION_NUMBER "3003001" +#define LIBARCHIVE_VERSION_NUMBER "3003002" _ACEOF -$as_echo "#define BSDCPIO_VERSION_STRING \"3.3.1\"" >>confdefs.h +$as_echo "#define BSDCPIO_VERSION_STRING \"3.3.2\"" >>confdefs.h -$as_echo "#define BSDTAR_VERSION_STRING \"3.3.1\"" >>confdefs.h +$as_echo "#define BSDTAR_VERSION_STRING \"3.3.2\"" >>confdefs.h -$as_echo "#define BSDCAT_VERSION_STRING \"3.3.1\"" >>confdefs.h +$as_echo "#define BSDCAT_VERSION_STRING \"3.3.2\"" >>confdefs.h # The shell variables here must be the same as the AC_SUBST() variables # below, but the shell variable names apparently cannot be the same as # the m4 macro names above. Why? Ask autoconf. -BSDCPIO_VERSION_STRING=3.3.1 -BSDTAR_VERSION_STRING=3.3.1 -BSDCAT_VERSION_STRING=3.3.1 -LIBARCHIVE_VERSION_STRING=3.3.1 -LIBARCHIVE_VERSION_NUMBER=3003001 +BSDCPIO_VERSION_STRING=3.3.2 +BSDTAR_VERSION_STRING=3.3.2 +BSDCAT_VERSION_STRING=3.3.2 +LIBARCHIVE_VERSION_STRING=3.3.2 +LIBARCHIVE_VERSION_NUMBER=3003002 # Substitute the above version numbers into the various files below. # Yes, I believe this is the fourth time we define what are essentially @@ -13554,6 +13564,19 @@ $as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h fi +for ac_header in acl/libacl.h attr/xattr.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + for ac_header in copyfile.h ctype.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -13678,7 +13701,7 @@ _ACEOF fi -for ac_header in locale.h paths.h poll.h pthread.h pwd.h +for ac_header in locale.h membership.h paths.h poll.h pthread.h pwd.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -13717,7 +13740,7 @@ fi done -for ac_header in sys/cdefs.h sys/extattr.h +for ac_header in sys/acl.h sys/cdefs.h sys/ea.h sys/extattr.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -13743,7 +13766,7 @@ fi done -for ac_header in sys/param.h sys/poll.h sys/select.h sys/statfs.h sys/statvfs.h +for ac_header in sys/param.h sys/poll.h sys/richacl.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -13756,7 +13779,7 @@ fi done -for ac_header in sys/time.h sys/utime.h sys/utsname.h sys/vfs.h +for ac_header in sys/select.h sys/statfs.h sys/statvfs.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -13769,7 +13792,7 @@ fi done -for ac_header in time.h unistd.h utime.h wchar.h wctype.h +for ac_header in sys/time.h sys/utime.h sys/utsname.h sys/vfs.h sys/xattr.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -13782,24 +13805,25 @@ fi done -for ac_header in windows.h +for ac_header in time.h unistd.h utime.h wchar.h wctype.h do : - ac_fn_c_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default" -if test "x$ac_cv_header_windows_h" = xyes; then : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define HAVE_WINDOWS_H 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi done -for ac_header in Bcrypt.h +for ac_header in windows.h do : - ac_fn_c_check_header_mongrel "$LINENO" "Bcrypt.h" "ac_cv_header_Bcrypt_h" "$ac_includes_default" -if test "x$ac_cv_header_Bcrypt_h" = xyes; then : + ac_fn_c_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default" +if test "x$ac_cv_header_windows_h" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_BCRYPT_H 1 +#define HAVE_WINDOWS_H 1 _ACEOF fi @@ -15335,6 +15359,13 @@ fi fi +# Check whether --with-cng was given. +if test "${with_cng+set}" = set; then : + withval=$with_cng; +fi + + + # Check whether --with-nettle was given. if test "${with_nettle+set}" = set; then : withval=$with_nettle; @@ -17538,7 +17569,7 @@ $as_echo "$ac_cv_func_CreateHardLinkA" >&6; } if test $ac_cv_func_CreateHardLinkA = yes; then : fi -for ac_func in arc4random_buf chflags chown chroot ctime_r dirfd +for ac_func in arc4random_buf chflags chown chroot ctime_r do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -17806,6 +17837,26 @@ if ac_fn_c_try_compile "$LINENO"; then : $as_echo "#define HAVE_READDIR_R 1" >>confdefs.h +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# dirfd can be either a function or a macro. +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + DIR *dir; +int +main () +{ +return(dirfd(dir)); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +$as_echo "#define HAVE_DIRFD 1" >>confdefs.h + + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -17845,32 +17896,7 @@ fi if test "x$enable_xattr" != "xno"; then - for ac_header in attr/xattr.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "attr/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default" -if test "x$ac_cv_header_attr_xattr_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_ATTR_XATTR_H 1 -_ACEOF - -fi - -done - - for ac_header in sys/xattr.h sys/ea.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing setxattr" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing setxattr" >&5 $as_echo_n "checking for library containing setxattr... " >&6; } if ${ac_cv_search_setxattr+:} false; then : $as_echo_n "(cached) " >&6 @@ -17926,31 +17952,45 @@ if test "$ac_res" != no; then : fi - for ac_func in extattr_get_file extattr_list_file -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF + ac_fn_c_check_decl "$LINENO" "EXTATTR_NAMESPACE_USER" "ac_cv_have_decl_EXTATTR_NAMESPACE_USER" "#include +#include +" +if test "x$ac_cv_have_decl_EXTATTR_NAMESPACE_USER" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 fi -done - for ac_func in extattr_set_fd extattr_set_file -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_EXTATTR_NAMESPACE_USER $ac_have_decl _ACEOF + ac_fn_c_check_decl "$LINENO" "XATTR_NOFOLLOW" "ac_cv_have_decl_XATTR_NOFOLLOW" "#include + +" +if test "x$ac_cv_have_decl_XATTR_NOFOLLOW" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 fi -done - for ac_func in fgetxattr flistxattr fsetxattr getxattr +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_XATTR_NOFOLLOW $ac_have_decl +_ACEOF + + if test "x$ac_cv_header_sys_xattr_h" = "xyes" \ + -a "x$ac_cv_have_decl_XATTR_NOFOLLOW" = "xyes"; then + # Darwin extended attributes support + if ${ac_cv_archive_xattr_darwin+:} false; then : + $as_echo_n "(cached) " >&6 +else + for ac_func in fgetxattr \ + flistxattr \ + fsetxattr \ + getxattr \ + listxattr \ + setxattr do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -17958,11 +17998,30 @@ if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF - + ac_cv_archive_xattr_darwin=yes +else + ac_cv_archive_xattr_darwin=no fi done - for ac_func in lgetxattr listxattr llistxattr lsetxattr + + +fi + + elif test "x$ac_cv_header_sys_extattr_h" = "xyes" \ + -a "x$ac_cv_have_decl_EXTATTR_NAMESPACE_USER" = "xyes"; then + # FreeBSD extended attributes support + if ${ac_cv_archive_xattr_freebsd+:} false; then : + $as_echo_n "(cached) " >&6 +else + for ac_func in extattr_get_fd \ + extattr_get_file \ + extattr_get_link \ + extattr_list_fd \ + extattr_list_file \ + extattr_list_link \ + extattr_set_fd \ + extattr_set_link do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -17970,11 +18029,30 @@ if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF - + ac_cv_archive_xattr_freebsd=yes +else + ac_cv_archive_xattr_freebsd=no fi done - for ac_func in fgetea flistea fsetea getea + + +fi + + elif test "x$ac_cv_header_sys_xattr_h" = "xyes" \ + -o "x$ac_cv_header_attr_xattr_h" = "xyes"; then + # Linux extended attributes support + if ${ac_cv_archive_xattr_linux+:} false; then : + $as_echo_n "(cached) " >&6 +else + for ac_func in fgetxattr \ + flistxattr \ + fsetxattr \ + getxattr \ + lgetxattr \ + listxattr \ + llistxattr \ + lsetxattr do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -17982,11 +18060,29 @@ if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF - + ac_cv_archive_xattr_linux=yes +else + ac_cv_archive_xattr_linux=no fi done - for ac_func in lgetea listea llistea lsetea + + +fi + + elif test "x$ac_cv_header_sys_ea_h" = "xyes"; then + # AIX extended attributes support + if ${ac_cv_archive_xattr_aix+:} false; then : + $as_echo_n "(cached) " >&6 +else + for ac_func in fgetea \ + flistea \ + fsetea \ + getea \ + lgetea \ + listea \ + llistea \ + lsetea do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -17994,24 +18090,48 @@ if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF - + ac_cv_archive_xattr_aix=yes +else + ac_cv_archive_xattr_aix=no fi done - ac_fn_c_check_decl "$LINENO" "EXTATTR_NAMESPACE_USER" "ac_cv_have_decl_EXTATTR_NAMESPACE_USER" "#include -#include -" -if test "x$ac_cv_have_decl_EXTATTR_NAMESPACE_USER" = xyes; then : - ac_have_decl=1 -else - ac_have_decl=0 + fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_EXTATTR_NAMESPACE_USER $ac_have_decl -_ACEOF + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for extended attributes support" >&5 +$as_echo_n "checking for extended attributes support... " >&6; } + if test "x$ac_cv_archive_xattr_linux" = "xyes"; then + +$as_echo "#define ARCHIVE_XATTR_LINUX 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Linux" >&5 +$as_echo "Linux" >&6; } + elif test "x$ac_cv_archive_xattr_darwin" = "xyes"; then + +$as_echo "#define ARCHIVE_XATTR_DARWIN 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5 +$as_echo "Darwin" >&6; } + elif test "x$ac_cv_archive_xattr_freebsd" = "xyes"; then +$as_echo "#define ARCHIVE_XATTR_FREEBSD 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: FreeBSD" >&5 +$as_echo "FreeBSD" >&6; } + elif test "x$ac_cv_archive_xattr_aix" = "xyes"; then + +$as_echo "#define ARCHIVE_XATTR_AIX 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: AIX" >&5 +$as_echo "AIX" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } + fi fi # Check for ACL support @@ -18028,31 +18148,8 @@ fi if test "x$enable_acl" != "xno"; then - for ac_header in acl/libacl.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "acl/libacl.h" "ac_cv_header_acl_libacl_h" "$ac_includes_default" -if test "x$ac_cv_header_acl_libacl_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_ACL_LIBACL_H 1 -_ACEOF - -fi - -done - - for ac_header in sys/acl.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "sys/acl.h" "ac_cv_header_sys_acl_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_acl_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_ACL_H 1 -_ACEOF - -fi - -done - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get_file in -lacl" >&5 + # Libacl + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get_file in -lacl" >&5 $as_echo_n "checking for acl_get_file in -lacl... " >&6; } if ${ac_cv_lib_acl_acl_get_file+:} false; then : $as_echo_n "(cached) " >&6 @@ -18097,121 +18194,84 @@ _ACEOF fi - for ac_func in acl_create_entry acl_get_fd_np -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - for ac_func in acl_init acl_set_fd acl_set_fd_np acl_set_file -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - - ac_fn_c_check_type "$LINENO" "acl_permset_t" "ac_cv_type_acl_permset_t" "#if HAVE_SYS_TYPES_H - #include - #endif - #if HAVE_SYS_ACL_H - #include - #endif + ac_fn_c_check_type "$LINENO" "acl_t" "ac_cv_type_acl_t" " + #if HAVE_SYS_TYPES_H + #include + #endif + #if HAVE_SYS_ACL_H + #include + #endif " -if test "x$ac_cv_type_acl_permset_t" = xyes; then : +if test "x$ac_cv_type_acl_t" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_ACL_PERMSET_T 1 +#define HAVE_ACL_T 1 _ACEOF fi +ac_fn_c_check_type "$LINENO" "acl_entry_t" "ac_cv_type_acl_entry_t" " + #if HAVE_SYS_TYPES_H + #include + #endif + #if HAVE_SYS_ACL_H + #include + #endif +" +if test "x$ac_cv_type_acl_entry_t" = xyes; then : - # The "acl_get_perm()" function was omitted from the POSIX draft. - # (It's a pretty obvious oversight; otherwise, there's no way to - # test for specific permissions in a permset.) Linux uses the obvious - # name, FreeBSD adds _np to mark it as "non-Posix extension." - # Test for both as a double-check that we really have POSIX-style ACL - # support. - for ac_func in acl_get_perm_np acl_get_perm acl_get_link acl_get_link_np -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +cat >>confdefs.h <<_ACEOF +#define HAVE_ACL_ENTRY_T 1 _ACEOF -fi -done - - - # Check for acl_is_trivial_np on FreeBSD - for ac_func in acl_is_trivial_np -do : - ac_fn_c_check_func "$LINENO" "acl_is_trivial_np" "ac_cv_func_acl_is_trivial_np" -if test "x$ac_cv_func_acl_is_trivial_np" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_ACL_IS_TRIVIAL_NP 1 -_ACEOF fi -done +ac_fn_c_check_type "$LINENO" "acl_permset_t" "ac_cv_type_acl_permset_t" " + #if HAVE_SYS_TYPES_H + #include + #endif + #if HAVE_SYS_ACL_H + #include + #endif - - # Check for ACL_TYPE_NFS4 - ac_fn_c_check_decl "$LINENO" "ACL_TYPE_NFS4" "ac_cv_have_decl_ACL_TYPE_NFS4" "#include " -if test "x$ac_cv_have_decl_ACL_TYPE_NFS4" = xyes; then : - -$as_echo "#define HAVE_ACL_TYPE_NFS4 1" >>confdefs.h - -fi - +if test "x$ac_cv_type_acl_permset_t" = xyes; then : - # MacOS has an acl.h that isn't POSIX. It can be detected by - # checking for ACL_USER - ac_fn_c_check_decl "$LINENO" "ACL_USER" "ac_cv_have_decl_ACL_USER" "#include -" -if test "x$ac_cv_have_decl_ACL_USER" = xyes; then : +cat >>confdefs.h <<_ACEOF +#define HAVE_ACL_PERMSET_T 1 +_ACEOF -$as_echo "#define HAVE_ACL_USER 1" >>confdefs.h fi +ac_fn_c_check_type "$LINENO" "acl_tag_t" "ac_cv_type_acl_tag_t" " + #if HAVE_SYS_TYPES_H + #include + #endif + #if HAVE_SYS_ACL_H + #include + #endif - - # MacOS has ACL_TYPE_EXTENDED instead - ac_fn_c_check_decl "$LINENO" "ACL_TYPE_EXTENDED" "ac_cv_have_decl_ACL_TYPE_EXTENDED" "#include - #include " -if test "x$ac_cv_have_decl_ACL_TYPE_EXTENDED" = xyes; then : +if test "x$ac_cv_type_acl_tag_t" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_ACL_TAG_T 1 +_ACEOF -$as_echo "#define HAVE_ACL_TYPE_EXTENDED 1" >>confdefs.h fi - # Solaris and derivates ACLs - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get in -lsec" >&5 -$as_echo_n "checking for acl_get in -lsec... " >&6; } -if ${ac_cv_lib_sec_acl_get+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for richacl_get_file in -lrichacl" >&5 +$as_echo_n "checking for richacl_get_file in -lrichacl... " >&6; } +if ${ac_cv_lib_richacl_richacl_get_file+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lsec $LIBS" +LIBS="-lrichacl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -18221,36 +18281,113 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char acl_get (); +char richacl_get_file (); int main () { -return acl_get (); +return richacl_get_file (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_sec_acl_get=yes + ac_cv_lib_richacl_richacl_get_file=yes else - ac_cv_lib_sec_acl_get=no + ac_cv_lib_richacl_richacl_get_file=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_sec_acl_get" >&5 -$as_echo "$ac_cv_lib_sec_acl_get" >&6; } -if test "x$ac_cv_lib_sec_acl_get" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_richacl_richacl_get_file" >&5 +$as_echo "$ac_cv_lib_richacl_richacl_get_file" >&6; } +if test "x$ac_cv_lib_richacl_richacl_get_file" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSEC 1 +#define HAVE_LIBRICHACL 1 +_ACEOF + + LIBS="-lrichacl $LIBS" + +fi + + + ac_fn_c_check_type "$LINENO" "struct richace" "ac_cv_type_struct_richace" " + #if HAVE_SYS_RICHACL_H + #include + #endif + +" +if test "x$ac_cv_type_struct_richace" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_RICHACE 1 _ACEOF - LIBS="-lsec $LIBS" fi +ac_fn_c_check_type "$LINENO" "struct richacl" "ac_cv_type_struct_richacl" " + #if HAVE_SYS_RICHACL_H + #include + #endif - ac_fn_c_check_type "$LINENO" "aclent_t" "ac_cv_type_aclent_t" "#include +" +if test "x$ac_cv_type_struct_richacl" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_RICHACL 1 +_ACEOF + + +fi + + + # Solaris and derivates ACLs + for ac_func in acl facl +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + + if test "x$ac_cv_lib_richacl_richacl_get_file" = "xyes" \ + -a "x$ac_cv_type_struct_richace" = "xyes" \ + -a "x$ac_cv_type_struct_richacl" = "xyes"; then + if ${ac_cv_archive_acl_librichacl+:} false; then : + $as_echo_n "(cached) " >&6 +else + for ac_func in richacl_alloc \ + richacl_equiv_mode \ + richacl_free \ + richacl_get_fd \ + richacl_get_file \ + richacl_set_fd \ + richacl_set_file +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + ac_cv_archive_acl_librichacl=yes +else + ac_cv_archive_acl_librichacl=no +fi +done + +fi + + fi + + if test "x$ac_cv_func_acl" = "xyes" \ + -a "x$ac_cv_func_facl" = "xyes"; then + ac_fn_c_check_type "$LINENO" "aclent_t" "ac_cv_type_aclent_t" "#include " if test "x$ac_cv_type_aclent_t" = xyes; then : @@ -18261,7 +18398,62 @@ _ACEOF fi - ac_fn_c_check_type "$LINENO" "ace_t" "ac_cv_type_ace_t" "#include + if test "x$ac_cv_type_aclent_t" = "xyes"; then + if ${ac_cv_archive_acl_sunos+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_fn_c_check_decl "$LINENO" "GETACL" "ac_cv_have_decl_GETACL" "#include +" +if test "x$ac_cv_have_decl_GETACL" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GETACL $ac_have_decl +_ACEOF +if test $ac_have_decl = 1; then : + ac_cv_archive_acl_sunos=yes +else + ac_cv_archive_acl_sunos=no +fi +ac_fn_c_check_decl "$LINENO" "SETACL" "ac_cv_have_decl_SETACL" "#include +" +if test "x$ac_cv_have_decl_SETACL" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_SETACL $ac_have_decl +_ACEOF +if test $ac_have_decl = 1; then : + ac_cv_archive_acl_sunos=yes +else + ac_cv_archive_acl_sunos=no +fi +ac_fn_c_check_decl "$LINENO" "GETACLCNT" "ac_cv_have_decl_GETACLCNT" "#include +" +if test "x$ac_cv_have_decl_GETACLCNT" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GETACLCNT $ac_have_decl +_ACEOF +if test $ac_have_decl = 1; then : + ac_cv_archive_acl_sunos=yes +else + ac_cv_archive_acl_sunos=no +fi + +fi + + ac_fn_c_check_type "$LINENO" "ace_t" "ac_cv_type_ace_t" "#include " if test "x$ac_cv_type_ace_t" = xyes; then : @@ -18272,20 +18464,362 @@ _ACEOF fi - for ac_func in acl_get facl_get acl_set facl_set + if test "x$ac_cv_type_ace_t" = "xyes"; then + if ${ac_cv_archive_acl_sunos_nfs4+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_fn_c_check_decl "$LINENO" "ACE_GETACL" "ac_cv_have_decl_ACE_GETACL" "#include +" +if test "x$ac_cv_have_decl_ACE_GETACL" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_ACE_GETACL $ac_have_decl +_ACEOF +if test $ac_have_decl = 1; then : + ac_cv_archive_acl_sunos_nfs4=yes +else + ac_cv_archive_acl_sonos_nfs4=no +fi +ac_fn_c_check_decl "$LINENO" "ACE_SETACL" "ac_cv_have_decl_ACE_SETACL" "#include +" +if test "x$ac_cv_have_decl_ACE_SETACL" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_ACE_SETACL $ac_have_decl +_ACEOF +if test $ac_have_decl = 1; then : + ac_cv_archive_acl_sunos_nfs4=yes +else + ac_cv_archive_acl_sonos_nfs4=no +fi +ac_fn_c_check_decl "$LINENO" "ACE_GETACLCNT" "ac_cv_have_decl_ACE_GETACLCNT" "#include +" +if test "x$ac_cv_have_decl_ACE_GETACLCNT" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_ACE_GETACLCNT $ac_have_decl +_ACEOF +if test $ac_have_decl = 1; then : + ac_cv_archive_acl_sunos_nfs4=yes +else + ac_cv_archive_acl_sonos_nfs4=no +fi + +fi + + fi + fi + elif test "x$ac_cv_type_acl_t" = "xyes" \ + -a "x$ac_cv_type_acl_entry_t" = "xyes" \ + -a "x$ac_cv_type_acl_permset_t" = "xyes" \ + -a "x$ac_cv_type_acl_tag_t" = "xyes"; then + # POSIX.1e ACL functions + if ${ac_cv_posix_acl_funcs+:} false; then : + $as_echo_n "(cached) " >&6 +else + for ac_func in acl_add_perm \ + acl_clear_perms \ + acl_create_entry \ + acl_delete_def_file \ + acl_free \ + acl_get_entry \ + acl_get_fd \ + acl_get_file \ + acl_get_permset \ + acl_get_qualifier \ + acl_get_tag_type \ + acl_init \ + acl_set_fd \ + acl_set_file \ + acl_set_qualifier \ + acl_set_tag_type do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + ac_cv_posix_acl_funcs=yes +else + ac_cv_posix_acl_funcs=no +fi +done + + +fi + + + for ac_func in acl_get_perm +do : + ac_fn_c_check_func "$LINENO" "acl_get_perm" "ac_cv_func_acl_get_perm" +if test "x$ac_cv_func_acl_get_perm" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ACL_GET_PERM 1 _ACEOF fi done + + if test "x$ac_cv_posix_acl_funcs" = "xyes" \ + -a "x$ac_cv_header_acl_libacl_h" = "xyes" \ + -a "x$ac_cv_lib_acl_acl_get_file" = "xyes" \ + -a "x$ac_cv_func_acl_get_perm"; then + if ${ac_cv_archive_acl_libacl+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_archive_acl_libacl=yes fi + +$as_echo "#define ARCHIVE_ACL_LIBACL 1" >>confdefs.h + + else + # FreeBSD/Darwin + for ac_func in acl_add_flag_np \ + acl_clear_flags_np \ + acl_get_brand_np \ + acl_get_entry_type_np \ + acl_get_flag_np \ + acl_get_flagset_np \ + acl_get_fd_np \ + acl_get_link_np \ + acl_get_perm_np \ + acl_is_trivial_np \ + acl_set_entry_type_np \ + acl_set_fd_np \ + acl_set_link_np +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + + for ac_func in mbr_uid_to_uuid \ + mbr_uuid_to_id \ + mbr_gid_to_uuid +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + + ac_fn_c_check_decl "$LINENO" "ACL_TYPE_EXTENDED" "ac_cv_have_decl_ACL_TYPE_EXTENDED" "#include + #include +" +if test "x$ac_cv_have_decl_ACL_TYPE_EXTENDED" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_ACL_TYPE_EXTENDED $ac_have_decl +_ACEOF +ac_fn_c_check_decl "$LINENO" "ACL_TYPE_NFS4" "ac_cv_have_decl_ACL_TYPE_NFS4" "#include + #include +" +if test "x$ac_cv_have_decl_ACL_TYPE_NFS4" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_ACL_TYPE_NFS4 $ac_have_decl +_ACEOF +ac_fn_c_check_decl "$LINENO" "ACL_USER" "ac_cv_have_decl_ACL_USER" "#include + #include +" +if test "x$ac_cv_have_decl_ACL_USER" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_ACL_USER $ac_have_decl +_ACEOF +ac_fn_c_check_decl "$LINENO" "ACL_SYNCHRONIZE" "ac_cv_have_decl_ACL_SYNCHRONIZE" "#include + #include +" +if test "x$ac_cv_have_decl_ACL_SYNCHRONIZE" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_ACL_SYNCHRONIZE $ac_have_decl +_ACEOF + + if test "x$ac_cv_posix_acl_funcs" = "xyes" \ + -a "x$ac_cv_func_acl_get_fd_np" = "xyes" \ + -a "x$ac_cv_func_acl_get_perm" != "xyes" \ + -a "x$ac_cv_func_acl_get_perm_np" = "xyes" \ + -a "x$ac_cv_func_acl_set_fd_np" = "xyes"; then + if test "x$ac_cv_have_decl_ACL_USER" = "xyes"; then + if ${ac_cv_archive_acl_freebsd+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_archive_acl_freebsd=yes +fi + + if test "x$ac_cv_have_decl_ACL_TYPE_NFS4" = "xyes" \ + -a "x$ac_cv_func_acl_add_flag_np" = "xyes" \ + -a "x$ac_cv_func_acl_get_brand_np" = "xyes" \ + -a "x$ac_cv_func_acl_get_entry_type_np" = "xyes" \ + -a "x$ac_cv_func_acl_get_flagset_np" = "xyes" \ + -a "x$ac_cv_func_acl_set_entry_type_np" = "xyes"; then + if ${ac_cv_archive_acl_freebsd_nfs4+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_archive_acl_freebsd_nfs4=yes +fi + + fi + elif test "x$ac_cv_have_decl_ACL_TYPE_EXTENDED" = "xyes" \ + -a "x$ac_cv_func_acl_add_flag_np" = "xyes" \ + -a "x$ac_cv_func_acl_get_flagset_np" = "xyes" \ + -a "x$ac_cv_func_acl_get_link_np" = "xyes" \ + -a "x$ac_cv_func_acl_set_link_np" = "xyes" \ + -a "x$ac_cv_func_mbr_uid_to_uuid" = "xyes" \ + -a "x$ac_cv_func_mbr_uuid_to_id" = "xyes" \ + -a "x$ac_cv_func_mbr_gid_to_uuid" = "xyes"; then + if ${ac_cv_archive_acl_darwin+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_archive_acl_darwin=yes +fi + + fi + fi + fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ACL support" >&5 +$as_echo_n "checking for ACL support... " >&6; } + if test "x$ac_cv_archive_acl_libacl" = "xyes" \ + -a "x$ac_cv_archive_acl_librichacl" = "xyes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: libacl (POSIX.1e) + librichacl (NFSv4)" >&5 +$as_echo "libacl (POSIX.1e) + librichacl (NFSv4)" >&6; } + +$as_echo "#define ARCHIVE_ACL_LIBACL 1" >>confdefs.h + + +$as_echo "#define ARCHIVE_ACL_LIBRICHACL 1" >>confdefs.h + + elif test "x$ac_cv_archive_acl_libacl" = "xyes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: libacl (POSIX.1e)" >&5 +$as_echo "libacl (POSIX.1e)" >&6; } + +$as_echo "#define ARCHIVE_ACL_LIBACL 1" >>confdefs.h + + elif test "x$ac_cv_archive_acl_librichacl" = "xyes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: librichacl (NFSv4)" >&5 +$as_echo "librichacl (NFSv4)" >&6; } + +$as_echo "#define ARCHIVE_ACL_LIBRICHACL 1" >>confdefs.h + + elif test "x$ac_cv_archive_acl_darwin" = "xyes"; then + +$as_echo "#define ARCHIVE_ACL_DARWIN 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin (limited NFSv4)" >&5 +$as_echo "Darwin (limited NFSv4)" >&6; } + elif test "x$ac_cv_archive_acl_sunos" = "xyes"; then + +$as_echo "#define ARCHIVE_ACL_SUNOS 1" >>confdefs.h + + if test "x$ac_cv_archive_acl_sunos_nfs4" = "xyes"; then + +$as_echo "#define ARCHIVE_ACL_SUNOS_NFS4 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Solaris (POSIX.1e and NFSv4)" >&5 +$as_echo "Solaris (POSIX.1e and NFSv4)" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Solaris (POSIX.1e)" >&5 +$as_echo "Solaris (POSIX.1e)" >&6; } + fi + elif test "x$ac_cv_archive_acl_freebsd" = "xyes"; then + +$as_echo "#define ARCHIVE_ACL_FREEBSD 1" >>confdefs.h + + if test "x$ac_cv_archive_acl_freebsd_nfs4" = "xyes"; then + +$as_echo "#define ARCHIVE_ACL_FREEBSD_NFS4 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: FreeBSD (POSIX.1e and NFSv4)" >&5 +$as_echo "FreeBSD (POSIX.1e and NFSv4)" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: FreeBSD (POSIX.1e)" >&5 +$as_echo "FreeBSD (POSIX.1e)" >&6; } + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } + fi +fi + + + if test "x$ac_cv_archive_acl_libacl" = "xyes" \ + -o "x$ac_cv_archive_acl_librichacl" = "xyes"; then + INC_LINUX_ACL_TRUE= + INC_LINUX_ACL_FALSE='#' +else + INC_LINUX_ACL_TRUE='#' + INC_LINUX_ACL_FALSE= +fi + + if test "x$ac_cv_archive_acl_sunos" = "xyes"; then + INC_SUNOS_ACL_TRUE= + INC_SUNOS_ACL_FALSE='#' +else + INC_SUNOS_ACL_TRUE='#' + INC_SUNOS_ACL_FALSE= +fi + + if test "x$ac_cv_archive_acl_darwin" = "xyes"; then + INC_DARWIN_ACL_TRUE= + INC_DARWIN_ACL_FALSE='#' +else + INC_DARWIN_ACL_TRUE='#' + INC_DARWIN_ACL_FALSE= +fi + + if test "x$ac_cv_archive_acl_freebsd" = "xyes"; then + INC_FREEBSD_ACL_TRUE= + INC_FREEBSD_ACL_FALSE='#' +else + INC_FREEBSD_ACL_TRUE='#' + INC_FREEBSD_ACL_FALSE= +fi + + # Additional requirements # Check whether --enable-largefile was given. if test "${enable_largefile+set}" = set; then : @@ -19281,6 +19815,27 @@ rm -f core conftest.err conftest.$ac_objext \ ;; esac +if test "x$with_cng" != "xno"; then + for ac_header in bcrypt.h +do : + ac_fn_c_check_header_compile "$LINENO" "bcrypt.h" "ac_cv_header_bcrypt_h" "#ifdef HAVE_WINDOWS_H + # include + #endif + +" +if test "x$ac_cv_header_bcrypt_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_BCRYPT_H 1 +_ACEOF + + LIBS="$LIBS -lbcrypt" + +fi + +done + +fi + if test "x$with_nettle" != "xno"; then for ac_header in nettle/md5.h nettle/ripemd160.h nettle/sha.h do : @@ -20844,6 +21399,22 @@ if test -z "${STATIC_BSDCPIO_TRUE}" && test -z "${STATIC_BSDCPIO_FALSE}"; then as_fn_error $? "conditional \"STATIC_BSDCPIO\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${INC_LINUX_ACL_TRUE}" && test -z "${INC_LINUX_ACL_FALSE}"; then + as_fn_error $? "conditional \"INC_LINUX_ACL\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${INC_SUNOS_ACL_TRUE}" && test -z "${INC_SUNOS_ACL_FALSE}"; then + as_fn_error $? "conditional \"INC_SUNOS_ACL\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${INC_DARWIN_ACL_TRUE}" && test -z "${INC_DARWIN_ACL_FALSE}"; then + as_fn_error $? "conditional \"INC_DARWIN_ACL\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${INC_FREEBSD_ACL_TRUE}" && test -z "${INC_FREEBSD_ACL_FALSE}"; then + as_fn_error $? "conditional \"INC_FREEBSD_ACL\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -21241,7 +21812,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libarchive $as_me 3.3.1, which was +This file was extended by libarchive $as_me 3.3.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21307,7 +21878,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libarchive config.status 3.3.1 +libarchive config.status 3.3.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -- cgit v1.2.3