From da8e14bcbb4e21cecbce28948975c7735ff94254 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Fri, 23 Jul 2010 11:47:16 +0400 Subject: [PATCH] Define ENABLE_VFS_NET in C code not in M4 one. Signed-off-by: Andrew Borodin --- lib/vfs/mc-vfs/vfs.h | 6 +++++- m4.include/mc-vfs.m4 | 3 --- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/vfs/mc-vfs/vfs.h b/lib/vfs/mc-vfs/vfs.h index 4697b3aee..25877dde9 100644 --- a/lib/vfs/mc-vfs/vfs.h +++ b/lib/vfs/mc-vfs/vfs.h @@ -26,6 +26,10 @@ typedef enum #ifdef ENABLE_VFS +#if defined (ENABLE_VFS_FTP) || defined (ENABLE_VFS_FISH) || defined (ENABLE_VFS_SMB) +#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. @@ -36,7 +40,7 @@ typedef void (*fill_names_f) (const char *); extern int vfs_timeout; -#ifdef USE_NETCODE +#ifdef ENABLE_VFS_NET extern int use_netrc; #endif diff --git a/m4.include/mc-vfs.m4 b/m4.include/mc-vfs.m4 index 3e270dd65..daea92271 100644 --- a/m4.include/mc-vfs.m4 +++ b/m4.include/mc-vfs.m4 @@ -73,9 +73,6 @@ AC_DEFUN([AC_MC_VFS_CHECKS], if test x"$enable_vfs_ftp" = x"yes" -o x"$enable_vfs_fish" = x"yes" -o x"$enable_vfs_smb" = x"yes"; then MC_ENABLE_VFS_NET - if test x"$enable_vfs_net" = x"yes"; then - AC_DEFINE([ENABLE_VFS_NET], [1], [Support for network filesystems]) - fi fi AM_CONDITIONAL([ENABLE_VFS_NET], [test x"$enable_vfs_net" = x"yes"])