mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-03 18:14:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #4420: fail to build with only SFTP network VFS enabled.

Browse Source 
* 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>
This commit is contained in:
Andrew Borodin 2022-12-18 18:51:29 +03:00
parent 995b61db9e
commit b69168cfb5
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/vfs/vfs.h
View File

@ -27,10 +27,6 @@
#define VFS_CLASS(a) ((struct vfs_class *) (a)) #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. * 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. * It gets the name of the virtual file system as its first argument.

3
m4.include/mc-vfs.m4
View File

@ -44,6 +44,7 @@ AC_DEFUN([mc_ENABLE_VFS_NET],
AC_CHECK_RPC AC_CHECK_RPC
enable_vfs_net=yes enable_vfs_net=yes
AC_DEFINE(ENABLE_VFS_NET, [1], [Define to enable network VFSes support])
fi fi
]) ])
@ -79,7 +80,7 @@ AC_DEFUN([mc_VFS_CHECKS],
AM_CONDITIONAL(ENABLE_VFS, [test x"$enable_vfs" = x"yes"]) 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 mc_ENABLE_VFS_NET
fi fi