Skip to content
This repository was archived by the owner on Feb 28, 2025. It is now read-only.

Commit b69168c

Browse files
committed
Ticket #4420: fail to build with only SFTP network VFS enabled.
* m4.include/mc-vfs.m4: use $enable_vfs_sftp to test functions required for network VFSes. Define ENABLE_VFS_NET preprocessor macro here... * lib/vfs/vfs.h: ...not here. Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
1 parent 995b61d commit b69168c

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

lib/vfs/vfs.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727

2828
#define VFS_CLASS(a) ((struct vfs_class *) (a))
2929

30-
#if defined (ENABLE_VFS_FTP) || defined (ENABLE_VFS_FISH)
31-
#define ENABLE_VFS_NET 1
32-
#endif
33-
3430
/**
3531
* This is the type of callback function passed to vfs_fill_names.
3632
* It gets the name of the virtual file system as its first argument.

m4.include/mc-vfs.m4

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ AC_DEFUN([mc_ENABLE_VFS_NET],
4444
AC_CHECK_RPC
4545
4646
enable_vfs_net=yes
47+
AC_DEFINE(ENABLE_VFS_NET, [1], [Define to enable network VFSes support])
4748
fi
4849
])
4950

@@ -79,7 +80,7 @@ AC_DEFUN([mc_VFS_CHECKS],
7980
8081
AM_CONDITIONAL(ENABLE_VFS, [test x"$enable_vfs" = x"yes"])
8182
82-
if test x"$enable_vfs_ftp" = x"yes" -o x"$enable_vfs_fish" = x"yes"; then
83+
if test x"$enable_vfs_ftp" = x"yes" -o x"$enable_vfs_fish" = x"yes" -o x"$enable_vfs_sftp" = x"yes"; then
8384
mc_ENABLE_VFS_NET
8485
fi
8586

0 commit comments

Comments
 (0)