VFS: cpiofs can now be switched off

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

lib/vfs/mc-vfs/Makefile.am

@@ -16,11 +16,11 @@ BASICFILES = \
 	utilvfs.c utilvfs.h	\
 	local.c local.h		\
 	gc.c gc.h		\
-	cpio.c			\
 	tar.c			\
 	extfs.c			\
 	sfs.c
 
+CPIOFILES = cpio.c
 UNDELFILES = undelfs.c
 
 NETFILES = \
@@ -31,6 +31,9 @@ NETFILES = \
 SMBFILES = smbfs.c smbfs.h
 
 libvfs_mc_la_SOURCES = $(BASICFILES)
+if ENABLE_VFS_CPIO
+libvfs_mc_la_SOURCES += $(CPIOFILES)
+endif
 if ENABLE_VFS_UNDELFS
 libvfs_mc_la_SOURCES += $(UNDELFILES)
 endif
@@ -42,7 +45,11 @@ libvfs_mc_la_SOURCES += $(SMBFILES)
 endif
 
 EXTRA_DIST = HACKING README \
-	$(BASICFILES) $(UNDELFILES) $(NETFILES) $(SMBFILES)
+	$(BASICFILES) \
+	$(CPIOFILES) \
+	$(UNDELFILES) \
+	$(NETFILES) \
+	$(SMBFILES)
 
 dist-hook:
 	$(mkinstalldirs) $(distdir)/samba

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

@@ -111,7 +111,9 @@ char *vfs_path (const char *path);
 /* vfs/direntry.c: */
 void *vfs_s_open (struct vfs_class *me, const char *file, int flags, mode_t mode);
 
+#ifdef ENABLE_VFS_CPIO
 void init_cpiofs (void);
+#endif
 void init_extfs (void);
 void init_fish (void);
 void init_sfs (void);

lib/vfs/mc-vfs/vfs.c

@@ -1336,8 +1336,9 @@ vfs_init (void)
     init_extfs ();
     init_sfs ();
     init_tarfs ();
+#ifdef ENABLE_VFS_CPIO
     init_cpiofs ();
-
+#endif /* ENABLE_VFS_CPIO */
 #ifdef ENABLE_VFS_UNDELFS
     init_undelfs ();
 #endif /* ENABLE_VFS_UNDELFS */

m4.include/mc-vfs.m4

@@ -66,7 +66,6 @@ AC_DEFUN([AC_MC_VFS_CHECKS],[
 
 	AC_MSG_NOTICE([Enabling VFS code])
 
-	AC_MC_VFS_CPIOFS
 	AC_MC_VFS_TARFS
 	AC_MC_VFS_FTP
 	AC_MC_VFS_FISH
@@ -78,7 +77,6 @@ AC_DEFUN([AC_MC_VFS_CHECKS],[
 
     else
 	vfs_type="Plain OS filesystem"
-	AM_CONDITIONAL(ENABLE_VFS_CPIO, [false])
 	AM_CONDITIONAL(ENABLE_VFS_TAR, [false])
 	AM_CONDITIONAL(ENABLE_VFS_FTP, [false])
 	AM_CONDITIONAL(ENABLE_VFS_FISH, [false])
@@ -86,6 +84,7 @@ AC_DEFUN([AC_MC_VFS_CHECKS],[
 	AM_CONDITIONAL(ENABLE_VFS_SFS, [false])
     fi
 
+    AC_MC_VFS_CPIOFS
     AC_MC_VFS_UNDELFS
 
     AM_CONDITIONAL(ENABLE_VFS, [test x"$enable_vfs" = x"yes"])

m4.include/vfs/mc-vfs-cpiofs.m4

@@ -2,8 +2,8 @@ dnl CPIO filesystem support
 AC_DEFUN([AC_MC_VFS_CPIOFS],
 [
     AC_ARG_ENABLE([vfs-cpio],
-                  [  --enable-vfs-cpio       Support for cpio filesystem [[yes]]])
-    if test x"$enable_vfs_cpio" != x"no"; then
+		    AC_HELP_STRING([--enable-vfs-cpio], [Support for cpio filesystem [[yes]]]))
+    if test "$enable_vfs" != "no" -a x"$enable_vfs_cpio" != x"no"; then
 	enable_vfs_cpio="yes"
 	AC_DEFINE([ENABLE_VFS_CPIO], [1], [Support for cpio filesystem])
 	AC_MC_VFS_ADDNAME([cpio])

src/textconf.c

@@ -33,9 +33,11 @@
 
 #ifdef ENABLE_VFS
 static const char *const vfs_supported[] = {
+#ifdef ENABLE_VFS_CPIO
+    "cpiofs",
+#endif
     "tarfs",
     "extfs",
-    "cpiofs",
 #ifdef ENABLE_VFS_UNDELFS
     "undelfs",
 #endif