Ticket #1916: non-vfs build fixups

* removed accidentially merged unfinished mvfs stuff
* added missing AM_CONDITIONAL's for non-vfs build
* fixed clashes between vfs/vfs.h and src/vfsdummy.h
* added missing functions/inlines to non-vfs build
This commit is contained in:
Enrico Weigelt, metux IT service 2009-12-29 04:34:26 +01:00 committed by Slava Zanko
parent f287f204be
commit 03b6d00976

View File

@ -72,8 +72,6 @@ AC_DEFUN([AC_MC_VFS_CHECKS],[
AC_MSG_NOTICE([Enabling VFS code])
AC_MC_MVFS_FILESYSTEMS
AC_MC_VFS_CPIOFS
AC_MC_VFS_TARFS
AC_MC_VFS_FTP
@ -88,6 +86,13 @@ 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])
AM_CONDITIONAL(ENABLE_VFS_EXTFS, [false])
AM_CONDITIONAL(ENABLE_VFS_SFS, [false])
AM_CONDITIONAL(ENABLE_VFS_UNDELFS, [false])
fi
AM_CONDITIONAL(ENABLE_VFS, [test x"$enable_vfs" = x"yes"])