mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 12:32:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

* configure.in: Don't install mcserv unless

Browse Source 
"--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.
This commit is contained in:
Pavel Roskin 2001-04-19 23:20:06 +00:00
parent d2026648fe
commit 30dc7621d4
4 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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> 2001-04-13 Pavel Roskin <proski@gnu.org>
* configure.in: Bump version to 4.5.53a. * configure.in: Bump version to 4.5.53a.

14
configure.in
View File

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

4
doc/Makefile.am
View File

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

4
vfs/Make-mc.in
View File

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