* configure.in: Don't install mcserv unless

"--enable-mcserv-install" has heen specified.
Don't quote the first argument in all calls to AM_CONDITIONAL
to work around a bug in Automake 1.4.
* doc/Makefile.am: Use MCSERV_INSTALL conditional.
* vfs/Make-mc.in: Likewise.

ChangeLog

@@ -1,3 +1,12 @@
+2001-04-19  Pavel Roskin  <proski@gnu.org>
+
+	* configure.in: Don't install mcserv unless
+	"--enable-mcserv-install" has heen specified.
+	Don't quote the first argument in all calls to AM_CONDITIONAL
+	to work around a bug in Automake 1.4.
+	* doc/Makefile.am: Use MCSERV_INSTALL conditional.
+	* vfs/Make-mc.in: Likewise.
+
 2001-04-13  Pavel Roskin  <proski@gnu.org>
 
 	* configure.in: Bump version to 4.5.53a.

configure.in

@@ -279,6 +279,16 @@ AC_CHECK_LIB(seq, get_process_stats, [
 	AC_DEFINE(HAVE_GET_PROCESS_STATS)])
 
 GNOME_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])
+
+AM_CONDITIONAL(MCSERV_INSTALL,
+	       [test "x$enable_mcserv_install$mcserv" = xyesmcserv])
+
 NETFILES=
 if test $have_socket = yes; then
    NETFILES="\$(NETFILES)"
@@ -446,7 +456,7 @@ AC_SUBST(mx)
 AC_SUBST(gmcdep)
 AC_SUBST(libgtkedit)
 AC_SUBST(GNOMEGNORBA_LIBS)
-AM_CONDITIONAL(GNOME, test x"$mx" = xmx)
+AM_CONDITIONAL(GNOME, [test x"$mx" = xmx])
 
 dnl
 dnl Check for the -mandoc package
@@ -975,7 +985,7 @@ fi],
   AC_CONFIG_SUBDIRS([vfs/samba])
 fi])
 
-AM_CONDITIONAL([USE_SAMBA_FS], [test "x$SAMBAFILES" != x])
+AM_CONDITIONAL(USE_SAMBA_FS, [test "x$SAMBAFILES" != x])
 
 AC_OUTPUT([
 Make.common 

doc/Makefile.am

@@ -1,3 +1,7 @@
+if MCSERV_INSTALL
 man_MANS = mc.1 mcedit.1 mcserv.8
+else
+man_MANS = mc.1 mcedit.1
+endif
 
 EXTRA_DIST = LSM DEVEL FILES

vfs/Make-mc.in

@@ -225,9 +225,7 @@ distclean: clean
 	rm -f *~
 	rm -f Makefile
 
-install: install_@mcserv@ install.extfs
-
-install_:
+install: install.extfs @MCSERV_INSTALL_TRUE@ install_mcserv
 
 install_mcserv:
 	$(mkinstalldirs) $(DESTDIR)$(bindir)