Skip to content

Commit

Permalink
Makefile changes to support fuse-t
Browse files Browse the repository at this point in the history
Signed-off-by: Alex Fishman <alex@fuse-t.org>
  • Loading branch information
macos-fuse-t committed Sep 3, 2022
1 parent f187961 commit 193b48d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ if DARWIN_COMPAT
sshfs_SOURCES += compat/darwin_compat.c compat/darwin_compat.h
endif

sshfs_LDADD = $(SSHFS_LIBS)
sshfs_CFLAGS = $(SSHFS_CFLAGS)
sshfs_LDADD = $(SSHFS_LIBS) -L/usr/local/lib -lfuse-t
sshfs_CFLAGS = $(SSHFS_CFLAGS) -D_FILE_OFFSET_BITS=64 -I/usr/local/include/fuse
sshfs_CPPFLAGS = -D_REENTRANT -DFUSE_USE_VERSION=26 -DLIBDIR=\"$(libdir)\" \
-DIDMAP_DEFAULT="\"$(IDMAP_DEFAULT)\""

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ fi
AM_CONDITIONAL(SSH_NODELAY_SO, test "$enable_sshnodelay" = "yes")

export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH
PKG_CHECK_MODULES([SSHFS], [fuse >= 2.3 glib-2.0 gthread-2.0])
PKG_CHECK_MODULES([SSHFS], [glib-2.0 gthread-2.0])
have_fuse_opt_parse=no
oldlibs="$LIBS"
LIBS="$LIBS $SSHFS_LIBS"
Expand Down
2 changes: 1 addition & 1 deletion sshfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <fuse_lowlevel.h>
#endif
#ifdef __APPLE__
# include <fuse_darwin.h>
//# include <fuse_darwin.h>
#endif
#include <assert.h>
#include <stdio.h>
Expand Down

0 comments on commit 193b48d

Please sign in to comment.