VFS: sfs can now be switched off

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>

lib/vfs/mc-vfs/Makefile.am

@@ -16,8 +16,7 @@ BASICFILES = \
 	utilvfs.c utilvfs.h	\
 	local.c local.h		\
 	gc.c gc.h		\
-	extfs.c			\
-	sfs.c
+	extfs.c
 
 CPIOFILES = cpio.c
 TARFILES = tar.c
@@ -39,6 +38,9 @@ endif
 if ENABLE_VFS_TAR
 libvfs_mc_la_SOURCES += $(TARFILES)
 endif
+if ENABLE_VFS_SFS
+libvfs_mc_la_SOURCES += $(SFSFILES)
+endif
 if ENABLE_VFS_UNDELFS
 libvfs_mc_la_SOURCES += $(UNDELFILES)
 endif
@@ -53,6 +55,7 @@ EXTRA_DIST = HACKING README \
 	$(BASICFILES) \
 	$(CPIOFILES) \
 	$(TARFILES) \
+	$(SFSFILES) \
 	$(UNDELFILES) \
 	$(NETFILES) \
 	$(SMBFILES)

lib/vfs/mc-vfs/vfs-impl.h

@@ -117,9 +117,11 @@ void init_cpiofs (void);
 #ifdef ENABLE_VFS_TAR
 void init_tarfs (void);
 #endif
+#ifdef ENABLE_VFS_SFS
+void init_sfs (void);
+#endif
 void init_extfs (void);
 void init_fish (void);
-void init_sfs (void);
 #ifdef ENABLE_VFS_UNDELFS
 void init_undelfs (void);
 #endif

lib/vfs/mc-vfs/vfs.c

@@ -1334,13 +1334,15 @@ vfs_init (void)
     localfs_class = vfs_list;
 
     init_extfs ();
-    init_sfs ();
 #ifdef ENABLE_VFS_CPIO
     init_cpiofs ();
 #endif /* ENABLE_VFS_CPIO */
 #ifdef ENABLE_VFS_TAR
     init_tarfs ();
 #endif /* ENABLE_VFS_TAR */
+#ifdef ENABLE_VFS_SFS
+    init_sfs ();
+#endif /* ENABLE_VFS_SFS */
 #ifdef ENABLE_VFS_UNDELFS
     init_undelfs ();
 #endif /* ENABLE_VFS_UNDELFS */

m4.include/mc-vfs.m4

@@ -69,7 +69,6 @@ AC_DEFUN([AC_MC_VFS_CHECKS],[
 	AC_MC_VFS_FTP
 	AC_MC_VFS_FISH
 	AC_MC_VFS_EXTFS
-	AC_MC_VFS_SFS
 	AC_MC_VFS_SAMBA
 
 	MC_WITH_VFS
@@ -79,11 +78,11 @@ AC_DEFUN([AC_MC_VFS_CHECKS],[
 	AM_CONDITIONAL(ENABLE_VFS_FTP, [false])
 	AM_CONDITIONAL(ENABLE_VFS_FISH, [false])
 	AM_CONDITIONAL(ENABLE_VFS_EXTFS, [false])
-	AM_CONDITIONAL(ENABLE_VFS_SFS, [false])
     fi
 
     AC_MC_VFS_CPIOFS
     AC_MC_VFS_TARFS
+    AC_MC_VFS_SFS
     AC_MC_VFS_UNDELFS
 
     AM_CONDITIONAL(ENABLE_VFS, [test x"$enable_vfs" = x"yes"])

m4.include/vfs/mc-vfs-sfs.m4

@@ -1,9 +1,9 @@
 dnl SFS support
 AC_DEFUN([AC_MC_VFS_SFS],
 [
-    AC_ARG_ENABLE([sfs],
-                  [  --enable-vfs-sfs        Support for sfs [[yes]]])
-    if test x"$enable_vfs_sfs" != x"no"; then
+    AC_ARG_ENABLE([vfs-sfs],
+		    AC_HELP_STRING([--enable-vfs-sfs], [Support for sfs filesystem [[yes]]]))
+    if test "$enable_vfs" != "no" -a x"$enable_vfs_sfs" != x"no"; then
 	enable_vfs_sfs="yes"
 	AC_MC_VFS_ADDNAME([sfs])
 	AC_DEFINE([ENABLE_VFS_SFS], [1], [Support for sfs])

src/textconf.c

@@ -38,6 +38,9 @@ static const char *const vfs_supported[] = {
 #endif
 #ifdef ENABLE_VFS_TAR
     "tarfs",
+#endif
+#ifdef ENABLE_VFS_SFS
+    "sfs",
 #endif
     "extfs",
 #ifdef ENABLE_VFS_UNDELFS