better fuse-t detection

Author: vasi

.github/workflows/ci.yml

@@ -25,11 +25,8 @@ jobs:
             os: macos-15
           - name: FUSE-T
             os: macos-15
-            ldflags: '-Wl,-rpath,/usr/local/lib'
-            configure_args: '--with-fuse-soname=fuse-t'
     env:
       CHECK_FEATURES: ${{ matrix.check_features }}
-      LDFLAGS: ${{ matrix.ldflags }}
       CONFIGURE_ARGS: ${{ matrix.configure_args }}
     steps:
       - name: checkout
@@ -52,22 +49,22 @@ jobs:
           HOMEBREW_NO_AUTO_UPDATE: 1
         run: |
           brew install autoconf automake libtool squashfs coreutils
-          echo "BREW_LDFLAGS=-L$(brew --prefix)/lib" >> $GITHUB_ENV
-          echo "BREW_CPPFLAGS=-I$(brew --prefix)/include" >> $GITHUB_ENV
+          echo "LDFLAGS=-L$(brew --prefix)/lib" >> $GITHUB_ENV
+          echo "CPPFLAGS=-I$(brew --prefix)/include" >> $GITHUB_ENV
         if: runner.os == 'macOS'
       - name: macfuse
         run: brew install --cask macfuse
         if: matrix.name == 'macFUSE'
       - name: fuse-t
         run: |
-          sudo mkdir -p /usr/local/include # no symlink to headers is placed here unless it exists
+          find /usr/local -ls
           brew tap macos-fuse-t/homebrew-cask
           brew install fuse-t
         if: matrix.name == 'FUSE-T'
       - name: configure
         run: |
           ./autogen.sh
-          env CPPFLAGS="-Werror $BREW_CPPFLAGS" LDFLAGS="$LDFLAGS $BREW_LDFLAGS" ./configure $CONFIGURE_ARGS
+          env CPPFLAGS="-Werror $CPPFLAGS" ./configure $CONFIGURE_ARGS
       - name: check discovered features
         run: diff -u ci/expected-features/${CHECK_FEATURES:-all} ci/features
         if: matrix.name != 'distcheck'

Makefile.am

@@ -33,7 +33,7 @@ libsquashfuse_convenience_la_SOURCES = swap.c cache.c table.c dir.c file.c fs.c
 	util.h fs.h
 libsquashfuse_convenience_la_CPPFLAGS = $(ZLIB_CPPFLAGS) $(XZ_CPPFLAGS) $(LZO_CPPFLAGS) \
 	$(LZ4_CPPFLAGS) $(ZSTD_CPPFLAGS) $(FUSE_CPPFLAGS)
-libsquashfuse_convenience_la_LIBADD = $(COMPRESSION_LIBS) $(FUSE_LIBS)
+libsquashfuse_convenience_la_LIBADD = $(COMPRESSION_LIBS)
 
 # Main library: libsquashfuse
 lib_LTLIBRARIES += libsquashfuse.la

m4/squashfuse_fuse.m4

@@ -163,6 +163,18 @@ AC_DEFUN([SQ_FIND_FUSE],[
 			[:])
 		SQ_KEEP_FLAGS([FUSE],[$sq_fuse_found])
 	])
+	# Use pkgconfig to look for fuse-t
+	AS_IF([test "x$sq_fuse_found" = xyes],,[
+        AC_DEFINE([FUSE_USE_VERSION], [26], [Version of FUSE API to use])
+		SQ_SAVE_FLAGS
+		SQ_PKG([fuse_t],[fuse-t],[
+			# FUSE-T bug can mis-install header path: https://github.com/macos-fuse-t/fuse-t/issues/77
+			CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64 -I/Library/Frameworks/fuse_t.framework/Headers"
+			SQ_TRY_FUSE([fuse-t],[sq_fuse_found=yes],
+	        [AC_MSG_FAILURE([Can't find fuse-t with pkgconfig])])
+		], [:])
+		SQ_KEEP_FLAGS([FUSE],[$sq_fuse_found])
+	])
 	
 	# Default search locations
 	AS_IF([test "x$sq_cv_lib_fuse_LIBS" = x],[SQ_SEARCH_FUSE_DIRS],[