mirror of
https://github.com/s3fs-fuse/s3fs-fuse.git
synced 2024-06-07 11:30:49 +00:00
Add support for FUSE-T on macos
Signed-off-by: Alex Fishman <alex@fuse-t.org> Signed-off-by: alex <alex@alex-NUC10.lan>
This commit is contained in:
parent
7c9cf84316
commit
45e7cd085a
28
configure.ac
28
configure.ac
|
@ -39,6 +39,7 @@ CXXFLAGS="$CXXFLAGS -Wall -fno-exceptions -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOUR
|
||||||
dnl ----------------------------------------------
|
dnl ----------------------------------------------
|
||||||
dnl For macOS
|
dnl For macOS
|
||||||
dnl ----------------------------------------------
|
dnl ----------------------------------------------
|
||||||
|
found_fuse_t=no
|
||||||
case "$target" in
|
case "$target" in
|
||||||
*-cygwin* )
|
*-cygwin* )
|
||||||
# Do something specific for windows using winfsp
|
# Do something specific for windows using winfsp
|
||||||
|
@ -48,6 +49,7 @@ case "$target" in
|
||||||
*-darwin* )
|
*-darwin* )
|
||||||
# Do something specific for mac
|
# Do something specific for mac
|
||||||
min_fuse_version=2.7.3
|
min_fuse_version=2.7.3
|
||||||
|
min_fuse_t_version=1.0.20
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
# Default Case
|
# Default Case
|
||||||
|
@ -56,6 +58,11 @@ case "$target" in
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
PKG_CHECK_MODULES([FUSE_T], [fuse-t >= ${min_fuse_t_version}], [found_fuse_t=yes], [found_fuse_t=no])
|
||||||
|
|
||||||
|
AS_IF([test "x$found_fuse_t" = "xyes"],
|
||||||
|
[PKG_CHECK_MODULES([common_lib_checking], [fuse-t >= ${min_fuse_t_version} libcurl >= 7.0 libxml-2.0 >= 2.6 ])])
|
||||||
|
|
||||||
dnl ----------------------------------------------
|
dnl ----------------------------------------------
|
||||||
dnl Choice SSL library
|
dnl Choice SSL library
|
||||||
dnl ----------------------------------------------
|
dnl ----------------------------------------------
|
||||||
|
@ -183,13 +190,18 @@ dnl
|
||||||
dnl For PKG_CONFIG before checking nss/gnutls.
|
dnl For PKG_CONFIG before checking nss/gnutls.
|
||||||
dnl this is redundant checking, but we need checking before following.
|
dnl this is redundant checking, but we need checking before following.
|
||||||
dnl
|
dnl
|
||||||
PKG_CHECK_MODULES([common_lib_checking], [fuse >= ${min_fuse_version} libcurl >= 7.0 libxml-2.0 >= 2.6 ])
|
AS_IF([test "x$found_fuse_t" = "xyes"],
|
||||||
|
[PKG_CHECK_MODULES([common_lib_checking], [fuse-t >= ${min_fuse_t_version} libcurl >= 7.0 libxml-2.0 >= 2.6 ])],
|
||||||
|
[PKG_CHECK_MODULES([common_lib_checking], [fuse >= ${min_fuse_version} libcurl >= 7.0 libxml-2.0 >= 2.6 ])])
|
||||||
|
|
||||||
AC_MSG_CHECKING([compile s3fs with])
|
AC_MSG_CHECKING([compile s3fs with])
|
||||||
case "${auth_lib}" in
|
case "${auth_lib}" in
|
||||||
openssl)
|
openssl)
|
||||||
AC_MSG_RESULT(OpenSSL)
|
AC_MSG_RESULT(OpenSSL)
|
||||||
PKG_CHECK_MODULES([DEPS], [fuse >= ${min_fuse_version} libcurl >= 7.0 libxml-2.0 >= 2.6 libcrypto >= 0.9 ])
|
AS_IF([test "x$found_fuse_t" = "xyes"],
|
||||||
|
[PKG_CHECK_MODULES([DEPS], [fuse-t >= ${min_fuse_t_version} libcurl >= 7.0 libxml-2.0 >= 2.6 libcrypto >= 0.9 ])],
|
||||||
|
[PKG_CHECK_MODULES([DEPS], [fuse >= ${min_fuse_version} libcurl >= 7.0 libxml-2.0 >= 2.6 libcrypto >= 0.9 ])])
|
||||||
|
|
||||||
AC_MSG_CHECKING([openssl 3.0 or later])
|
AC_MSG_CHECKING([openssl 3.0 or later])
|
||||||
AC_COMPILE_IFELSE(
|
AC_COMPILE_IFELSE(
|
||||||
[AC_LANG_PROGRAM([[#include <openssl/opensslv.h>
|
[AC_LANG_PROGRAM([[#include <openssl/opensslv.h>
|
||||||
|
@ -206,7 +218,9 @@ gnutls)
|
||||||
AS_IF([test "$gnutls_nettle" = ""], [AC_CHECK_LIB(gcrypt, gcry_control, [gnutls_nettle=0])])
|
AS_IF([test "$gnutls_nettle" = ""], [AC_CHECK_LIB(gcrypt, gcry_control, [gnutls_nettle=0])])
|
||||||
AS_IF([test $gnutls_nettle = 0],
|
AS_IF([test $gnutls_nettle = 0],
|
||||||
[
|
[
|
||||||
PKG_CHECK_MODULES([DEPS], [fuse >= ${min_fuse_version} libcurl >= 7.0 libxml-2.0 >= 2.6 gnutls >= 2.12.0 ])
|
AS_IF([test "x$found_fuse_t" = "xyes"],
|
||||||
|
[PKG_CHECK_MODULES([DEPS], [fuse-t >= ${min_fuse_t_version} libcurl >= 7.0 libxml-2.0 >= 2.6 gnutls >= 2.12.0 ])],
|
||||||
|
[PKG_CHECK_MODULES([DEPS], [fuse >= ${min_fuse_version} libcurl >= 7.0 libxml-2.0 >= 2.6 gnutls >= 2.12.0 ])])
|
||||||
LIBS="-lgnutls -lgcrypt $LIBS"
|
LIBS="-lgnutls -lgcrypt $LIBS"
|
||||||
AC_MSG_CHECKING([gnutls is build with])
|
AC_MSG_CHECKING([gnutls is build with])
|
||||||
AC_MSG_RESULT(gcrypt)
|
AC_MSG_RESULT(gcrypt)
|
||||||
|
@ -220,7 +234,9 @@ nettle)
|
||||||
AS_IF([test "$gnutls_nettle" = ""], [AC_CHECK_LIB(nettle, nettle_MD5Init, [gnutls_nettle=1])])
|
AS_IF([test "$gnutls_nettle" = ""], [AC_CHECK_LIB(nettle, nettle_MD5Init, [gnutls_nettle=1])])
|
||||||
AS_IF([test $gnutls_nettle = 1],
|
AS_IF([test $gnutls_nettle = 1],
|
||||||
[
|
[
|
||||||
PKG_CHECK_MODULES([DEPS], [fuse >= ${min_fuse_version} libcurl >= 7.0 libxml-2.0 >= 2.6 nettle >= 2.7.1 ])
|
AS_IF([test "x$found_fuse_t" = "xyes"],
|
||||||
|
[PKG_CHECK_MODULES([DEPS], [fuse-t >= ${min_fuse_t_version} libcurl >= 7.0 libxml-2.0 >= 2.6 nettle >= 2.7.1 ])],
|
||||||
|
[PKG_CHECK_MODULES([DEPS], [fuse >= ${min_fuse_version} libcurl >= 7.0 libxml-2.0 >= 2.6 nettle >= 2.7.1 ])])
|
||||||
LIBS="-lgnutls -lnettle $LIBS"
|
LIBS="-lgnutls -lnettle $LIBS"
|
||||||
AC_MSG_CHECKING([gnutls is build with])
|
AC_MSG_CHECKING([gnutls is build with])
|
||||||
AC_MSG_RESULT(nettle)
|
AC_MSG_RESULT(nettle)
|
||||||
|
@ -229,7 +245,9 @@ nettle)
|
||||||
;;
|
;;
|
||||||
nss)
|
nss)
|
||||||
AC_MSG_RESULT(NSS)
|
AC_MSG_RESULT(NSS)
|
||||||
PKG_CHECK_MODULES([DEPS], [fuse >= ${min_fuse_version} libcurl >= 7.0 libxml-2.0 >= 2.6 nss >= 3.15.0 ])
|
AS_IF([test "x$found_fuse_t" = "xyes"],
|
||||||
|
[PKG_CHECK_MODULES([DEPS], [fuse-t >= ${min_fuse_t_version} libcurl >= 7.0 libxml-2.0 >= 2.6 nss >= 3.15.0 ])],
|
||||||
|
[PKG_CHECK_MODULES([DEPS], [fuse >= ${min_fuse_version} libcurl >= 7.0 libxml-2.0 >= 2.6 nss >= 3.15.0 ])])
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
AC_MSG_ERROR([unknown ssl library type.])
|
AC_MSG_ERROR([unknown ssl library type.])
|
||||||
|
|
Loading…
Reference in New Issue
Block a user