Merge branch '4420_sftp_network_vfs'

* 4420_sftp_network_vfs:
  Ticket #4420: fail to build with only SFTP network VFS enabled.
This commit is contained in:
Andrew Borodin 2022-12-30 08:09:28 +03:00
commit 5583c3d9c0
2 changed files with 2 additions and 5 deletions

View File

@ -27,10 +27,6 @@
#define VFS_CLASS(a) ((struct vfs_class *) (a))
#if defined (ENABLE_VFS_FTP) || defined (ENABLE_VFS_FISH)
#define ENABLE_VFS_NET 1
#endif
/**
* This is the type of callback function passed to vfs_fill_names.
* It gets the name of the virtual file system as its first argument.

View File

@ -44,6 +44,7 @@ AC_DEFUN([mc_ENABLE_VFS_NET],
AC_CHECK_RPC
enable_vfs_net=yes
AC_DEFINE(ENABLE_VFS_NET, [1], [Define to enable network VFSes support])
fi
])
@ -79,7 +80,7 @@ AC_DEFUN([mc_VFS_CHECKS],
AM_CONDITIONAL(ENABLE_VFS, [test x"$enable_vfs" = x"yes"])
if test x"$enable_vfs_ftp" = x"yes" -o x"$enable_vfs_fish" = x"yes"; then
if test x"$enable_vfs_ftp" = x"yes" -o x"$enable_vfs_fish" = x"yes" -o x"$enable_vfs_sftp" = x"yes"; then
mc_ENABLE_VFS_NET
fi