Macintosh-SW
/
afpfs-ng-mac
mirror of https://github.com/mabam/afpfs-ng-mac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes for macFUSE v4.x file locations

This commit is contained in:
mabam 2020-12-19 22:00:53 +01:00
parent ca11111a4b
commit 525141ed45
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.h.in
View File

@ -33,7 +33,7 @@
/* Define to 1 if you have the <inttypes.h> header file. */ /* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H #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 #undef HAVE_LIBFUSE
/* Define to 1 if you have the `gcrypt' library (-lgcrypt). */ /* Define to 1 if you have the `gcrypt' library (-lgcrypt). */

10
configure vendored
View File

@ -21824,13 +21824,13 @@ echo "$as_me: error: FUSE is not installed. To build without fuse, configure wi
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
{ echo "$as_me:$LINENO: checking for fuse_main in /usr/local/lib/libosxfuse.la" >&5 { 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/libosxfuse.la... $ECHO_C" >&6; } 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 if test "${ac_cv_lib_fuse_fuse_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
ac_check_lib_save_LIBS=$LIBS 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 cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
@ -21890,13 +21890,13 @@ if test $ac_cv_lib_fuse_fuse_main = yes; then
#define HAVE_LIBFUSE 1 #define HAVE_LIBFUSE 1
_ACEOF _ACEOF
LIBS="/usr/local/lib/libosxfuse.la $LIBS" LIBS="/usr/local/lib/libfuse.la $LIBS"
fi fi
CFLAGS=$old_cflags CFLAGS=$old_cflags
CPPFLAGS=$old_cppflags CPPFLAGS=$old_cppflags
LIBFUSE_LDFLAGS="/usr/local/lib/libosxfuse.la" LIBFUSE_LDFLAGS="/usr/local/lib/libfuse.la"
if true; then if true; then
HAVE_LIBFUSE_TRUE= HAVE_LIBFUSE_TRUE=

2
configure.ac
View File

@ -79,7 +79,7 @@ case $host in
AC_CHECK_LIB([fuse], [fuse_main]) AC_CHECK_LIB([fuse], [fuse_main])
CFLAGS=$old_cflags CFLAGS=$old_cflags
CPPFLAGS=$old_cppflags CPPFLAGS=$old_cppflags
LIBFUSE_LDFLAGS="/usr/local/lib/libosxfuse.la" LIBFUSE_LDFLAGS="/usr/local/lib/libfuse.la"
AC_SUBST(LIBFUSE_LDFLAGS) AC_SUBST(LIBFUSE_LDFLAGS)
AM_CONDITIONAL(HAVE_LIBFUSE, true) AM_CONDITIONAL(HAVE_LIBFUSE, true)
fi fi

4
fuse/Makefile.am
View File

@ -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 mount_afp2_LDADD = $(top_builddir)/lib/libafpclient.la
afpfsd_SOURCES = commands.c daemon.c fuse_int.c fuse_error.c 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_LDADD = $(top_builddir)/lib/libafpclient.la /usr/local/lib/libfuse.la
afpfsd_LDFLAGS = -export-dynamic /usr/local/lib/libosxfuse.la afpfsd_LDFLAGS = -export-dynamic /usr/local/lib/libfuse.la
afpfsd_CFLAGS = -I$(top_srcdir)/include -D_FILE_OFFSET_BITS=64 @CFLAGS@ afpfsd_CFLAGS = -I$(top_srcdir)/include -D_FILE_OFFSET_BITS=64 @CFLAGS@
install-data-hook: install-data-hook:

4
fuse/Makefile.in
View File

@ -187,8 +187,8 @@ mount_afp2_SOURCES = client.c
mount_afp2_CFLAGS = -I$(top_srcdir)/include -D_FILE_OFFSET_BITS=64 @CFLAGS@ mount_afp2_CFLAGS = -I$(top_srcdir)/include -D_FILE_OFFSET_BITS=64 @CFLAGS@
mount_afp2_LDADD = $(top_builddir)/lib/libafpclient.la mount_afp2_LDADD = $(top_builddir)/lib/libafpclient.la
afpfsd_SOURCES = commands.c daemon.c fuse_int.c fuse_error.c 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_LDADD = $(top_builddir)/lib/libafpclient.la /usr/local/lib/libfuse.la
afpfsd_LDFLAGS = -export-dynamic /usr/local/lib/libosxfuse.la afpfsd_LDFLAGS = -export-dynamic /usr/local/lib/libfuse.la
afpfsd_CFLAGS = -I$(top_srcdir)/include -D_FILE_OFFSET_BITS=64 @CFLAGS@ afpfsd_CFLAGS = -I$(top_srcdir)/include -D_FILE_OFFSET_BITS=64 @CFLAGS@
all: all-am all: all-am

2
fuse/commands.c
View File

@ -35,7 +35,7 @@
#ifdef __linux #ifdef __linux
#define FUSE_DEVICE "/dev/fuse" #define FUSE_DEVICE "/dev/fuse"
#else #else
#define FUSE_DEVICE "/dev/osxfuse0" #define FUSE_DEVICE "/dev/macfuse0"
#endif #endif

2
fuse/fuse_int.c
View File

@ -20,7 +20,7 @@
#include "afpfs-ng/afp.h" #include "afpfs-ng/afp.h"
#include </usr/local/include/osxfuse/fuse.h> #include </usr/local/include/fuse.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>