Merge branch '4420_sftp_network_vfs'

* 4420_sftp_network_vfs: Ticket #4420: fail to build with only SFTP network VFS enabled.
MidnightCommander · Dec 30, 2022 · 5583c3d · 5583c3d
2 parents 995b61d + b69168c
commit 5583c3d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/lib/vfs/vfs.h b/lib/vfs/vfs.h
@@ -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.

diff --git a/m4.include/mc-vfs.m4 b/m4.include/mc-vfs.m4
@@ -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