Fixed configure options description.

doc/INSTALL: fixed description of configure options.
maint/mc-test: fixed configure options.
maint/mctest: likewise.

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

doc/INSTALL

@@ -173,19 +173,14 @@ VFS options:
      Support for sfs
 
 `--enable-vfs-undelfs'
+     (off by default)
      Support for ext2 undelete filesystem.
      On systems that use the ext2 or ext3 file system and have the
      libext2fs library available, this option adds support for
      recovering deleted files (the undel virtual file system).
 
-`--disable-netcode'
+`--with-vfs-smb'
-     This option disables support for networked virtual filesystems.
+     (off by default)
-     It's primarily used by developers to make sure that the code would
-     compile and run on operating systems that lack POSIX compatible
-     network support.  But you can use it is you know that you won't be
-     accessing remote filesystems from GNU Midnight Commander.
-
-`--with-samba'
      This option enables remote VFS over the SMB protocol.  A stripped
      down version of samba distributed with the sources is compiled and
      linked with the mc executable.  It is recommended that you install
@@ -206,11 +201,8 @@ ncurses):
 `--with-screen={slang|ncurses}'
      Choose the library used to manage interaction with the terminal.
      `slang' means S-Lang library already installed on the system,
-     `mcslang' means S-Lang library included with the sources of
+     `ncurses' means ncurses library already installed on the system.
-     GNU Midnight Commander, `ncurses' means ncurses library already
+     The S-Lang library is used by default if found.
-     installed on the system.  The installed S-Lang library is used
-     by default if found, otherwise the included S-Lang library is
-     used.
 
 `--with-slang-includes=[DIR]'
      Set path to SLANG includes [default=/usr/include]; make sense
@@ -220,11 +212,6 @@ ncurses):
      Set path to SLANG library [default=/usr/lib]; mke sense only
      if --with-screen=slang is used.
 
-`--with-termcap'
-     If the included S-Lang library is used, this option forces it to
-     use the termcap database, as opposed to the default terminfo
-     database.
-
 `--with-ncurses-includes=[DIR]'
      Set path to ncurses includes [default=/usr/include]; make
      sense only if --with-screen=ncurses is used;

maint/mc-test

@@ -48,7 +48,7 @@ mc_cflags=""
 
 mc_ldflags=""
 
-mc_tests="plain glib12 charset no_charset vfs no_vfs samba "\
+mc_tests="plain charset no_charset vfs no_vfs samba "\
 "no_samba ext2undel no_ext2undel slang ncurses maintainer "\
 "no_maintainer i18n no_i18n no_features all_features"
 
@@ -149,14 +149,14 @@ renice ${mc_nice_value} $$ 1>/dev/null 2>&1 || true
 ### Tools ###
 
 configure_args_enable_all="--enable-largefile --enable-nls "\
-"--enable-netcode --enable-background --enable-charset "\
+"--enable-background --enable-charset "\
 "--with-mmap --with-included-gettext --with-x "\
-"--with-vfs --with-samba --with-ext2undel "\
+"--enable-vfs --enable-vfs-smb --enable-vfs-undelfs "\
 "--with-gpm-mouse --with-subshell --with-edit"
 configure_args_disable_all="--disable-largefile --disable-nls "\
-"--disable-netcode --disable-background --disable-charset "\
+"--disable-background --disable-charset "\
 "--without-mmap --without-included-gettext --without-x "\
-"--without-vfs --without-samba --without-ext2undel "\
+"--disable-vfs --disable-vfs-smb --disable-vfs-undelfs "\
 "--without-gpm-mouse --without-subshell --without-edit"
 
 errors=0
@@ -359,12 +359,6 @@ test_plain() {
 	confbuild
 }
 
-test_glib12() {
-	testname="glib12"
-	configure_args="--with-glib12"
-	confbuild
-}
-
 test_charset() {
 	testname="charset"
 	configure_args="--enable-charset"
@@ -391,37 +385,37 @@ test_no_X11() {
 
 test_vfs() {
 	testname="vfs"
-	configure_args="--with-vfs"
+	configure_args="--enable-vfs"
 	confbuild
 }
 
 test_no_vfs() {
 	testname="no_vfs"
-	configure_args="--without-vfs"
+	configure_args="--disable-vfs"
 	confbuild
 }
 
 test_samba() {
 	testname="samba"
-	configure_args="--with-samba"
+	configure_args="--enable-vfs-smb"
 	confbuild
 }
 
 test_no_samba() {
 	testname="no_samba"
-	configure_args="--without-samba"
+	configure_args="--disable-vfs-smb"
 	confbuild
 }
 
 test_ext2undel() {
 	testname="ext2undel"
-	configure_args="--with-ext2undel"
+	configure_args="--enable-vfs-undelfs"
 	confbuild
 }
 
 test_no_ext2undel() {
 	testname="no_ext2undel"
-	configure_args="--without-ext2undel"
+	configure_args="--disable-vfs-undelfs"
 	confbuild
 }
 

maint/mctest

@@ -41,7 +41,7 @@ distcheck 1
 
 echo "Checking the configuration with maximal code coverage"
 distcheck 2 enable_charset=yes with_samba=yes \
-     with_included_gettext=yes with_glib12=yes
+     with_included_gettext=yes
 
 echo "Checking the configuration with minimal code coverage"
 distcheck 3 enable_largefile=no enable_nls=no with_vfs=no \
@@ -54,8 +54,7 @@ distcheck 4 enable_largefile=no enable_nls=no with_vfs=no \
      with_screen=ncurses
 
 echo "Checking the configuration with experimental and rarely used options"
-distcheck 5 with_termcap=yes \
+distcheck 5 with_mmap=no with_subshell=optional
-     with_mmap=no with_subshell=optional enable_netcode=no
 
 RPMBUILD=/usr/bin/rpmbuild
 if test -x $RPMBUILD; then