diff options
author | Luca Bruno <luca.bruno@coreos.com> | 2022-01-04 10:27:14 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-04 10:27:14 +0000 |
commit | a3555f4d1239c1c1aab356a5979e15665fef6ad6 (patch) | |
tree | fd89ec82bd474ba7e997950e435ed57801621552 /configure.ac | |
parent | 4d47733f98f98d14a5e60d8015b90d0921602df5 (diff) | |
parent | 43859b58f6b76e958e54ec5d3d1250d906ce12bf (diff) | |
download | ostree-a3555f4d1239c1c1aab356a5979e15665fef6ad6.tar.gz |
Merge pull request #2376 from smcv/fuse3
rofiles-fuse: Build using FUSE 3 if possible, falling back to FUSE 2
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 7dea7d2b..551fc445 100644 --- a/configure.ac +++ b/configure.ac @@ -254,6 +254,7 @@ AS_IF([test x$with_ed25519_libsodium != xno], [ AM_CONDITIONAL(USE_LIBSODIUM, test "x$have_libsodium" = xyes) LIBARCHIVE_DEPENDENCY="libarchive >= 2.8.0" +FUSE3_DEPENDENCY="fuse3 >= 3.1.1" # What's in RHEL7.2. FUSE_DEPENDENCY="fuse >= 2.9.2" @@ -448,8 +449,22 @@ AC_ARG_ENABLE(rofiles-fuse, [generate rofiles-fuse helper [default=yes]])],, enable_rofiles_fuse=yes) AS_IF([ test x$enable_rofiles_fuse != xno ], [ - PKG_CHECK_MODULES(BUILDOPT_FUSE, $FUSE_DEPENDENCY) -], [enable_rofiles_fuse=no]) + PKG_CHECK_MODULES([FUSE3], [$FUSE3_DEPENDENCY], + [ + FUSE_USE_VERSION=31 + BUILDOPT_FUSE_CFLAGS="$FUSE3_CFLAGS" + BUILDOPT_FUSE_LIBS="$FUSE3_LIBS" + ], + [PKG_CHECK_MODULES([FUSE], [$FUSE_DEPENDENCY], + [ + FUSE_USE_VERSION=26 + BUILDOPT_FUSE_CFLAGS="$FUSE_CFLAGS" + BUILDOPT_FUSE_LIBS="$FUSE_LIBS" + ])]) + AC_DEFINE_UNQUOTED([FUSE_USE_VERSION], [$FUSE_USE_VERSION], [Define to the FUSE API version]) + AC_SUBST([BUILDOPT_FUSE_CFLAGS]) + AC_SUBST([BUILDOPT_FUSE_LIBS]) + ], [enable_rofiles_fuse=no]) AM_CONDITIONAL(BUILDOPT_FUSE, test x$enable_rofiles_fuse = xyes) AC_ARG_WITH(dracut, |