From 0c44599f92dc556364c18bd8c1e65808776dd614 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 10 Apr 2024 11:44:49 +0200 Subject: [PATCH 1/2] autotools: check for sys/vfs.h and linux/bpf.h Addresses: https://github.com/util-linux/util-linux/pull/2933 Addresses: https://github.com/util-linux/util-linux/issues/2945 Signed-off-by: Karel Zak --- configure.ac | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac index 2fff2de09d5..33e5e4a68fd 100644 --- a/configure.ac +++ b/configure.ac @@ -328,6 +328,7 @@ AC_CHECK_HEADERS([ \ inttypes.h \ lastlog.h \ libutil.h \ + linux/bpf.h \ linux/blkzoned.h \ linux/btrfs.h \ linux/capability.h \ @@ -515,6 +516,8 @@ have_shadow_h=$ac_cv_header_shadow_h have_sys_signalfd_h=$ac_cv_header_sys_signalfd_h have_utmpx_h=$ac_cv_header_utmpx_h have_mntent_h=$ac_cv_header_mntent_h +have_sys_vfs_h=$ac_cv_header_sys_vfs_h +have_linux_bpf_h=$ac_cv_header_linux_bpf_h AS_CASE([$linux_os:$have_linux_version_h], [yes:no], @@ -1286,6 +1289,7 @@ UL_BUILD_INIT([libmount]) UL_REQUIRES_BUILD([libmount], [libblkid]) UL_REQUIRES_HAVE([libmount], [dirfd,ddfd], [dirfd or ddfd function]) UL_REQUIRES_HAVE([libmount], [mntent_h], [mntent.h header file]) +UL_REQUIRES_HAVE([libmount], [sys_vfs_h], [sys/vfs.h header file]) AM_CONDITIONAL([BUILD_LIBMOUNT], [test "x$build_libmount" = xyes]) AM_CONDITIONAL([BUILD_LIBMOUNT_TESTS], [test "x$build_libmount" = xyes && test "x$enable_static" = xyes]) AS_IF([test "x$build_libmount" = xyes], [ @@ -1848,6 +1852,7 @@ AC_ARG_ENABLE([lsfd], UL_BUILD_INIT([lsfd]) UL_REQUIRES_LINUX([lsfd]) UL_REQUIRES_BUILD([lsfd], [libsmartcols]) +UL_REQUIRES_HAVE([lsfd], [linux_bpf_h], [linux/bpf.h header file]) AM_CONDITIONAL([BUILD_LSFD], [test "x$build_lsfd" = xyes]) AC_ARG_ENABLE([lslogins], From ba05b9ffa7544c2fa5f88147acc85f704d4785de Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 10 Apr 2024 11:50:58 +0200 Subject: [PATCH 2/2] autotools: add --disable-enosys, check for linux/audit.h Signed-off-by: Karel Zak --- configure.ac | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 33e5e4a68fd..c302732e734 100644 --- a/configure.ac +++ b/configure.ac @@ -328,6 +328,7 @@ AC_CHECK_HEADERS([ \ inttypes.h \ lastlog.h \ libutil.h \ + linux/audit.h \ linux/bpf.h \ linux/blkzoned.h \ linux/btrfs.h \ @@ -497,6 +498,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ dnl Convert some ac_cv_header_* variables to have_* dnl +have_linux_audit_h=$ac_cv_header_linux_audit_h have_linux_blkzoned_h=$ac_cv_header_linux_blkzoned_h have_linux_btrfs_h=$ac_cv_header_linux_btrfs_h have_linux_capability_h=$ac_cv_header_linux_capability_h @@ -1952,8 +1954,13 @@ UL_REQUIRES_LINUX([waitpid]) UL_REQUIRES_SYSCALL_CHECK([waitpid], [UL_CHECK_SYSCALL([pidfd_open])], [pidfd_open]) AM_CONDITIONAL([BUILD_WAITPID], [test "x$build_waitpid" = xyes]) -UL_BUILD_INIT([enosys], [check]) +AC_ARG_ENABLE([enosys], + AS_HELP_STRING([--disable-enosys], [do not build enosys]), + [], [UL_DEFAULT_ENABLE([enosys], [check])] +) +UL_BUILD_INIT([enosys]) UL_REQUIRES_LINUX([enosys]) +UL_REQUIRES_HAVE([enosys], [linux_audit_h], [linux/audit.h header file]) AS_IF([test "x$build_enosys" = xyes], [ AC_MSG_CHECKING([for valid audit arch]) AC_COMPILE_IFELSE(