From 525141ed458a7f5c4c2f5651550c6fb3031af3ed Mon Sep 17 00:00:00 2001
From: mabam <forum@amolsch.com>
Date: Sat, 19 Dec 2020 22:00:53 +0100
Subject: [PATCH] Fixes for macFUSE v4.x file locations

---
 config.h.in      |  2 +-
 configure        | 10 +++++-----
 configure.ac     |  2 +-
 fuse/Makefile.am |  4 ++--
 fuse/Makefile.in |  4 ++--
 fuse/commands.c  |  2 +-
 fuse/fuse_int.c  |  2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/config.h.in b/config.h.in
index 89c9bfd..c12a549 100644
--- a/config.h.in
+++ b/config.h.in
@@ -33,7 +33,7 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* Define to 1 if you have the `fuse' library (-losxfuse). */
+/* Define to 1 if you have the `fuse' library (-lfuse). */
 #undef HAVE_LIBFUSE
 
 /* Define to 1 if you have the `gcrypt' library (-lgcrypt). */
diff --git a/configure b/configure
index a5ed1b2..4341c8a 100755
--- a/configure
+++ b/configure
@@ -21824,13 +21824,13 @@ echo "$as_me: error: FUSE is not installed.  To build without fuse, configure wi
    { (exit 1); exit 1; }; }
 		fi
 
-{ echo "$as_me:$LINENO: checking for fuse_main in /usr/local/lib/libosxfuse.la" >&5
-echo $ECHO_N "checking for fuse_main in /usr/local/lib/libosxfuse.la... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for fuse_main in /usr/local/lib/libfuse.la" >&5
+echo $ECHO_N "checking for fuse_main in /usr/local/lib/libfuse.la... $ECHO_C" >&6; }
 if test "${ac_cv_lib_fuse_fuse_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="/usr/local/lib/libosxfuse.la  $LIBS"
+LIBS="/usr/local/lib/libfuse.la  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -21890,13 +21890,13 @@ if test $ac_cv_lib_fuse_fuse_main = yes; then
 #define HAVE_LIBFUSE 1
 _ACEOF
 
-  LIBS="/usr/local/lib/libosxfuse.la $LIBS"
+  LIBS="/usr/local/lib/libfuse.la $LIBS"
 
 fi
 
 		CFLAGS=$old_cflags
 		CPPFLAGS=$old_cppflags
-		LIBFUSE_LDFLAGS="/usr/local/lib/libosxfuse.la"
+		LIBFUSE_LDFLAGS="/usr/local/lib/libfuse.la"
 
 		 if true; then
   HAVE_LIBFUSE_TRUE=
diff --git a/configure.ac b/configure.ac
index 610181c..dc90a30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,7 +79,7 @@ case $host in
 		AC_CHECK_LIB([fuse], [fuse_main])
 		CFLAGS=$old_cflags
 		CPPFLAGS=$old_cppflags
-		LIBFUSE_LDFLAGS="/usr/local/lib/libosxfuse.la"
+		LIBFUSE_LDFLAGS="/usr/local/lib/libfuse.la"
 		AC_SUBST(LIBFUSE_LDFLAGS)
 		AM_CONDITIONAL(HAVE_LIBFUSE, true)
 	fi
diff --git a/fuse/Makefile.am b/fuse/Makefile.am
index e3e6a38..56d1c95 100644
--- a/fuse/Makefile.am
+++ b/fuse/Makefile.am
@@ -5,8 +5,8 @@ mount_afp2_CFLAGS = -I$(top_srcdir)/include -D_FILE_OFFSET_BITS=64 @CFLAGS@
 mount_afp2_LDADD = $(top_builddir)/lib/libafpclient.la
 
 afpfsd_SOURCES = commands.c daemon.c fuse_int.c fuse_error.c
-afpfsd_LDADD = $(top_builddir)/lib/libafpclient.la /usr/local/lib/libosxfuse.la
-afpfsd_LDFLAGS = -export-dynamic /usr/local/lib/libosxfuse.la
+afpfsd_LDADD = $(top_builddir)/lib/libafpclient.la /usr/local/lib/libfuse.la
+afpfsd_LDFLAGS = -export-dynamic /usr/local/lib/libfuse.la
 afpfsd_CFLAGS = -I$(top_srcdir)/include -D_FILE_OFFSET_BITS=64 @CFLAGS@
 
 install-data-hook:
diff --git a/fuse/Makefile.in b/fuse/Makefile.in
index 0c5e22c..3159a51 100644
--- a/fuse/Makefile.in
+++ b/fuse/Makefile.in
@@ -187,8 +187,8 @@ mount_afp2_SOURCES = client.c
 mount_afp2_CFLAGS = -I$(top_srcdir)/include -D_FILE_OFFSET_BITS=64 @CFLAGS@
 mount_afp2_LDADD = $(top_builddir)/lib/libafpclient.la
 afpfsd_SOURCES = commands.c daemon.c fuse_int.c fuse_error.c
-afpfsd_LDADD = $(top_builddir)/lib/libafpclient.la /usr/local/lib/libosxfuse.la
-afpfsd_LDFLAGS = -export-dynamic /usr/local/lib/libosxfuse.la
+afpfsd_LDADD = $(top_builddir)/lib/libafpclient.la /usr/local/lib/libfuse.la
+afpfsd_LDFLAGS = -export-dynamic /usr/local/lib/libfuse.la
 afpfsd_CFLAGS = -I$(top_srcdir)/include -D_FILE_OFFSET_BITS=64 @CFLAGS@
 all: all-am
 
diff --git a/fuse/commands.c b/fuse/commands.c
index b01bc0b..b7e3aad 100644
--- a/fuse/commands.c
+++ b/fuse/commands.c
@@ -35,7 +35,7 @@
 #ifdef __linux
 #define FUSE_DEVICE "/dev/fuse"
 #else
-#define FUSE_DEVICE "/dev/osxfuse0"
+#define FUSE_DEVICE "/dev/macfuse0"
 #endif
 
 
diff --git a/fuse/fuse_int.c b/fuse/fuse_int.c
index 2022c83..4221304 100644
--- a/fuse/fuse_int.c
+++ b/fuse/fuse_int.c
@@ -20,7 +20,7 @@
 
 #include "afpfs-ng/afp.h"
 
-#include </usr/local/include/osxfuse/fuse.h>
+#include </usr/local/include/fuse.h>
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>