* configure.in: Roll --enable-mcserv-install into ...

* acinclude.m4: ... --with-mcfs.  Adjust makefiles.
* INSTALL: Document --with-mcfs.
This commit is contained in:
Pavel Roskin 2002-09-13 06:01:41 +00:00
parent 11861f090b
commit f17e11bc9f
6 changed files with 21 additions and 17 deletions

View File

@ -1,3 +1,9 @@
2002-09-13 Pavel Roskin <proski@gnu.org>
* configure.in: Roll --enable-mcserv-install into ...
* acinclude.m4: ... --with-mcfs. Adjust makefiles.
* INSTALL: Document --with-mcfs.
2002-09-12 Pavel Roskin <proski@gnu.org>
* configure.in: Don't check if crypt() prototype is needed to

View File

@ -103,6 +103,8 @@ the directory base where you installed the gpm package.
`--with-hsc'
Compiles support for HSC firewall into the ftp virtual file system.
Use this option with caution - it disables support for normal FTP
proxies.
`--with-mmap', `--without-mmap'
Force using or not using the mmap function. It is currently used
@ -130,6 +132,13 @@ the directory base where you installed the gpm package.
transparent tar File system manipulation as well nor the
networked Midnight Commander file system.
`--with-mcfs'
This option enables mcfs - a non-standard remote filesystem
designed specifically for the Midnight Commander. It also enables
a server for that filesystem, mcserv. Please note that the
implementation of mcfs is not optimized for speed. There may be
security issues with mcserv - don't run it if you don't need it.
`--disable-largefile'
This option disables support for large files (2 gigabytes and more)
on the systems where file operations use 32-bit offsets by default,

View File

@ -98,7 +98,8 @@ AC_DEFUN([MC_WITH_VFS],[
[ --with-mcfs Support mc-specific networking file system [[no]]],
[if test "x$withval" != "xno"; then
AC_DEFINE(WITH_MCFS, 1, [Define to enable mc-specific networking file system])
vfs_flags="$vfs_flags, mcfs"
vfs_flags="$vfs_flags, mcfs"
use_mcfs=yes
fi]
)
vfs_flags="$vfs_flags, ftpfs, fish"

View File

@ -245,15 +245,8 @@ have to use that instead of gettimeofday])])
MC_VFS_CHECKS
dnl
dnl Install mcserv only if explicitly enabled
dnl
AC_ARG_ENABLE([mcserv-install],
[ --enable-mcserv-install Install mcserv - Midnight Commander file server [[no]]])
vfs_type="normal"
if test $use_vfs = yes
then
if test x$use_vfs = xyes; then
AC_MSG_NOTICE([enabling VFS code])
vfs_type="Midnight Commander Virtual File System"
fi
@ -666,8 +659,7 @@ AM_CONDITIONAL(USE_VFS, [test "x$use_vfs" = xyes])
AM_CONDITIONAL(USE_VFS_NET, [test x"$use_net_code" = xtrue])
AM_CONDITIONAL(USE_UNDEL_FS, [test -n "$undelfs_o"])
AM_CONDITIONAL(USE_SAMBA_FS, [test -n "$SAMBAFILES"])
AM_CONDITIONAL(MCSERV_INSTALL,
[test "x$enable_mcserv_install$mcserv" = xyesmcserv])
AM_CONDITIONAL(USE_MCFS, [test -n "$use_mcfs"])
AM_CONDITIONAL(INCLUDED_SLANG,
[test "x$slang_use_system_installed_lib" = xfalse])
AM_CONDITIONAL(CHARSET, [test -n "$have_charset"])

View File

@ -1,6 +1,6 @@
SUBDIRS = es hu it pl ru
if MCSERV_INSTALL
if USE_MCFS
man_MANS = mc.1 mcedit.1 mcserv.8
else
man_MANS = mc.1 mcedit.1

View File

@ -92,12 +92,8 @@ else
libvfs_mc_a_SOURCES = $(NONETFILES)
endif
if MCSERV_INSTALL
if USE_MCFS
sbin_PROGRAMS = mcserv
else
if USE_VFS
noinst_PROGRAMS = mcserv
endif
endif
mcserv_SOURCES = mcserv.c tcputil.c