diff options
| -rwxr-xr-x | autogen.sh | 1 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
3 files changed, 6 insertions, 5 deletions
@@ -6,7 +6,6 @@ if [ "$1" == "-d" ]; then shift; echo "Running ./configure" echo - sleep 1s ./configure "$@" elif [ -n "$1" ]; then echo diff --git a/configure.ac b/configure.ac index 0598619..b847280 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,9 @@ AC_PROG_LIBTOOL AC_ARG_ENABLE([debug-output], [AS_HELP_STRING([--enable-debug-output], [enable debug output])]) AC_ARG_WITH([core-foundation], - AS_HELP_STRING([--with-core-foundation], [link against Core Foundation (OS X only) @<:@default=no@:>@])) + AS_HELP_STRING([--with-core-foundation], [(MacOS only) link against Core Foundation @<:@default=no@:>@])) +AC_ARG_ENABLE([macos-fs-link], + [AS_HELP_STRING([--disable-macos-fs-link], [(MacOS only) don't install link to /Library/Filesystems - disables 'mount -t bindfs' and /etc/fstab support])]) AC_ARG_WITH([fuse2], [AS_HELP_STRING([--with-fuse2], [link against libfuse 2.x (default: autodetect, preferring 3.x)])]) AC_ARG_WITH([fuse3], @@ -26,7 +28,7 @@ if test x"$with_core_foundation" == "xyes" ; then LDFLAGS="${LDFLAGS} -framework CoreFoundation" fi -AM_CONDITIONAL([BUILD_OS_IS_DARWIN], [case $build_os in darwin* ) true ;; * ) false ;; esac]) +AM_CONDITIONAL([INSTALL_MACOS_FS_LINK], [case $build_os in darwin* ) test x"$enable_macos_fs_link" != "xno" ;; * ) false ;; esac]) # _XOPEN_SOURCE is >= 500 for pread/pwrite; >= 700 for utimensat. # __BSD_VISIBLE is for flock() on FreeBSD. It otherwise gets hidden by _XOPEN_SOURCE. diff --git a/src/Makefile.am b/src/Makefile.am index 1fd6ef9..4c24816 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,12 +11,12 @@ bindfs_LDADD = ${fuse_LIBS} ${fuse3_LIBS} ${fuse_t_LIBS} ${my_LDFLAGS} man_MANS = bindfs.1 -if BUILD_OS_IS_DARWIN +if INSTALL_MACOS_FS_LINK bindfs_BUNDLEDIR = $(DESTDIR)/Library/Filesystems/bindfs.fs bindfs_BUNDLEBINDIR = "${bindfs_BUNDLEDIR}/Contents/Resources" install-exec-hook: - (mkdir -p "${bindfs_BUNDLEBINDIR}"; ln -s "${bindir}/bindfs" "${bindfs_BUNDLEBINDIR}/mount_bindfs") + (mkdir -p "${bindfs_BUNDLEBINDIR}"; ln -sf "${bindir}/bindfs" "${bindfs_BUNDLEBINDIR}/mount_bindfs") uninstall-hook: (rm -rf ${bindfs_BUNDLEDIR}) |