diff options
| author | Karel Zak | 2018-10-24 14:32:29 +0200 |
|---|---|---|
| committer | Karel Zak | 2018-12-03 11:23:33 +0100 |
| commit | a68ed87ffe10a172a20094e2c3c7a542c5d71fbe (patch) | |
| tree | 462193e4590d173b025b3d42db52cf3d3ea75635 /configure.ac | |
| parent | build-sys: improve error message (diff) | |
| download | kernel-qcow2-util-linux-a68ed87ffe10a172a20094e2c3c7a542c5d71fbe.tar.gz kernel-qcow2-util-linux-a68ed87ffe10a172a20094e2c3c7a542c5d71fbe.tar.xz kernel-qcow2-util-linux-a68ed87ffe10a172a20094e2c3c7a542c5d71fbe.zip | |
build-sys: do not require dirfd()
The dirfd() is required on many places, but it should not be required for
all utils by ./configure.ac.
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index f223adb9f..e6ba49553 100644 --- a/configure.ac +++ b/configure.ac @@ -600,10 +600,7 @@ AS_IF([test x"$have_dirfd" = xno], [ #include <dirent.h>]) ]) -AS_CASE([$have_dirfd:$have_ddfd], - [no:no], - [AC_MSG_ERROR([cannot find a method to get filedescriptor of directory])] -) +AM_CONDITIONAL([HAVE_DIRFD], [test "x$have_dirfd" = xyes -o "x$have_ddfd" = xyes]) AC_MSG_CHECKING([whether program_invocation_short_name is defined]) @@ -1071,6 +1068,7 @@ AC_ARG_ENABLE([libblkid], ) UL_BUILD_INIT([libblkid]) UL_REQUIRES_HAVE([libblkid], [openat], [openat functions]) +UL_REQUIRES_HAVE([libblkid], [dirfd,ddfd], [dirfd or ddfd function]) AC_SUBST([LIBBLKID_DATE]) AC_SUBST([LIBBLKID_VERSION]) AC_SUBST([LIBBLKID_VERSION_INFO]) @@ -1092,6 +1090,7 @@ AC_ARG_ENABLE([libmount], UL_BUILD_INIT([libmount]) UL_REQUIRES_BUILD([libmount], [libblkid]) UL_REQUIRES_HAVE([libmount], [scanf_alloc_modifier], [scanf string alloc modifier]) +UL_REQUIRES_HAVE([libmount], [dirfd,ddfd], [dirfd or ddfd function]) AM_CONDITIONAL([BUILD_LIBMOUNT], [test "x$build_libmount" = xyes]) AM_CONDITIONAL([BUILD_LIBMOUNT_TESTS], [test "x$build_libmount" = xyes -a "x$enable_static" = xyes]) AS_IF([test "x$build_libmount" = xyes], [ @@ -1168,6 +1167,7 @@ enable_cfdisk=$enable_fdisks UL_BUILD_INIT([fdisk]) UL_REQUIRES_HAVE([fdisk], [openat], [openat functions]) +UL_REQUIRES_HAVE([fdisk], [dirfd,ddfd], [dirfd or ddfd function]) UL_REQUIRES_BUILD([fdisk], [libfdisk]) UL_REQUIRES_BUILD([fdisk], [libsmartcols]) AM_CONDITIONAL([BUILD_FDISK], [test "x$build_fdisk" = xyes]) @@ -1175,6 +1175,7 @@ AM_CONDITIONAL([BUILD_FDISK], [test "x$build_fdisk" = xyes]) UL_BUILD_INIT([sfdisk]) UL_REQUIRES_HAVE([sfdisk], [openat], [openat functions]) +UL_REQUIRES_HAVE([sfdisk], [dirfd,ddfd], [dirfd or ddfd function]) UL_REQUIRES_BUILD([sfdisk], [libfdisk]) UL_REQUIRES_BUILD([sfdisk], [libsmartcols]) AM_CONDITIONAL([BUILD_SFDISK], [test "x$build_sfdisk" = xyes]) @@ -1642,6 +1643,7 @@ AC_ARG_ENABLE([switch_root], UL_BUILD_INIT([switch_root]) UL_REQUIRES_LINUX([switch_root]) UL_REQUIRES_HAVE([switch_root], [openat], [openat function]) +UL_REQUIRES_HAVE([switch_root], [dirfd,ddfd], [dirfd or ddfd function]) AM_CONDITIONAL([BUILD_SWITCH_ROOT], [test "x$build_switch_root" = xyes]) |