]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commitdiff
Use the fuse3 libraries reported by pkg-config
authorTheodore Ts'o <tytso@mit.edu>
Sat, 14 Jun 2025 20:47:26 +0000 (16:47 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Sun, 15 Jun 2025 02:33:11 +0000 (22:33 -0400)
It used to be that PKG_CHECK_MODULES would set foo_LDFLAGS; not it
just sets the foo_LIBS with the required -L and -l options.  Fix this
up for fuse3 support.

This fixes support on MacOS using MacFuse.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
configure
configure.ac

index 0ac202d8272d5b0639a3e6aee7dd8215bef5da41..e53d937fc95f810d73c52016ed3adea8851970f0 100755 (executable)
--- a/configure
+++ b/configure
@@ -14553,8 +14553,8 @@ fi
 if test "$FUSE_LIB" = "-lfuse3"
 then
        FUSE_USE_VERSION=35
-       CFLAGS="$CFLAGS $fuse3_CFLAGS"
-       LDFLAGS="$LDFLAGS $fuse3_LDFLAGS"
+       CFLAGS="$fuse3_CFLAGS $CFLAGS"
+       FUSE_LIB="$fuse3_LIBS"
               for ac_header in pthread.h fuse.h
 do :
   as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh`
index 35b206e78229c8c1d58803207e8ccb173aed6320..61330104ab1191e08a4642de454b0caba04fab0b 100644 (file)
@@ -1416,8 +1416,8 @@ AC_SUBST(FUSE_CMT)
 if test "$FUSE_LIB" = "-lfuse3"
 then
        FUSE_USE_VERSION=35
-       CFLAGS="$CFLAGS $fuse3_CFLAGS"
-       LDFLAGS="$LDFLAGS $fuse3_LDFLAGS"
+       CFLAGS="$fuse3_CFLAGS $CFLAGS"
+       FUSE_LIB="$fuse3_LIBS"
        AC_CHECK_HEADERS([pthread.h fuse.h], [],
                [AC_MSG_FAILURE([Cannot find fuse3 fuse2fs headers.])],
 [#define _FILE_OFFSET_BITS     64