]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
configure.ac: remove incorrect 4th argument to `AC_CHECK_FUNCS` (#2334)
authorMichał Górny <mgorny@gentoo.org>
Fri, 11 Oct 2024 06:17:01 +0000 (08:17 +0200)
committerGitHub <noreply@github.com>
Fri, 11 Oct 2024 06:17:01 +0000 (08:17 +0200)
Remove the incorrect 4th argument from `AC_CHECK_FUNCS` calls. The macro
uses only three arguments, so it was ignored anyway. Furthermore, in at
least once instance it was wrong -- due to a typo in `attr/xatr.h`
header name.

configure.ac

index 1d7c8da572064a695e90df4a627ff8be5d737e3b..a2c4b7bf08a2da0fb5ea983f71529c30f7a6b373 100644 (file)
@@ -924,9 +924,7 @@ if test "x$enable_xattr" != "xno"; then
                          listxattr \
                          setxattr,
          [ac_cv_archive_xattr_darwin=yes],
-         [ac_cv_archive_xattr_darwin=no],
-         [#include <sys/xattr.h>
-])
+         [ac_cv_archive_xattr_darwin=no])
        ]
       )
     elif test "x$ac_cv_header_sys_extattr_h" = "xyes" \
@@ -942,10 +940,7 @@ if test "x$enable_xattr" != "xno"; then
                          extattr_set_fd \
                          extattr_set_link,
          [ac_cv_archive_xattr_freebsd=yes],
-         [ac_cv_archive_xattr_freebsd=no],
-         [#include <sys/types.h>
-#include <sys/extattr.h>
-])
+         [ac_cv_archive_xattr_freebsd=no])
          ]
        )
     elif test "x$ac_cv_header_sys_xattr_h" = "xyes" \
@@ -961,17 +956,7 @@ if test "x$enable_xattr" != "xno"; then
                          llistxattr \
                          lsetxattr,
          [ac_cv_archive_xattr_linux=yes],
-         [ac_cv_archive_xattr_linux=no],
-         [#if HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#if HAVE_SYS_XATTR_H
-#include <sys/xattr.h>
-#endif
-#if HAVE_ATTR_XATTR_H
-#include <attr/xatr.h>
-#endif
-])
+         [ac_cv_archive_xattr_linux=no])
        ]
       )
     elif test "x$ac_cv_header_sys_ea_h" = "xyes"; then
@@ -986,9 +971,7 @@ if test "x$enable_xattr" != "xno"; then
                          llistea \
                          lsetea,
          [ac_cv_archive_xattr_aix=yes],
-         [ac_cv_archive_xattr_aix=no],
-         [#include <sys/ea.h>
-])
+         [ac_cv_archive_xattr_aix=no])
          ]
        )
     fi
@@ -1057,7 +1040,7 @@ if test "x$enable_acl" != "xno"; then
                          richacl_get_file \
                          richacl_set_fd \
                          richacl_set_file,
-         [ac_cv_archive_acl_librichacl=yes], [ac_cv_archive_acl_librichacl=no],          [#include <sys/richacl.h>])])
+         [ac_cv_archive_acl_librichacl=yes], [ac_cv_archive_acl_librichacl=no])])
     fi
 
     if test "x$ac_cv_func_acl" = "xyes" \
@@ -1099,14 +1082,7 @@ if test "x$enable_acl" != "xno"; then
                          acl_set_file \
                          acl_set_qualifier \
                          acl_set_tag_type,
-         [ac_cv_posix_acl_funcs=yes], [ac_cv_posix_acl_funcs=no],
-         [#if HAVE_SYS_TYPES_H
-          #include <sys/types.h>
-          #endif
-          #if HAVE_SYS_ACL_H
-          #include <sys/acl.h>
-          #endif
-         ])
+         [ac_cv_posix_acl_funcs=yes], [ac_cv_posix_acl_funcs=no])
        ])
 
        AC_CHECK_FUNCS(acl_get_perm)
@@ -1133,14 +1109,11 @@ if test "x$enable_acl" != "xno"; then
                            acl_is_trivial_np \
                            acl_set_entry_type_np \
                            acl_set_fd_np \
-                           acl_set_link_np,,,
-             [#include <sys/types.h>
-              #include <sys/acl.h>])
+                           acl_set_link_np)
 
            AC_CHECK_FUNCS(mbr_uid_to_uuid \
                           mbr_uuid_to_id \
-                          mbr_gid_to_uuid,,,
-             [#include <membership.h>])
+                          mbr_gid_to_uuid)
 
            AC_CHECK_DECLS([ACL_TYPE_EXTENDED, ACL_TYPE_NFS4, ACL_USER,
              ACL_SYNCHRONIZE], [], [],