diff --git a/ChangeLog b/ChangeLog index 7c7cf0b32..16117efbc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-09-03 Pavel Roskin + + * acinclude.m4: Remove Termnet support, it's too old and obscure + to be supported properly. + 2002-08-27 Pavel Roskin * lib/mc.ext.in: Add new OpenOffice.org formats. Always use diff --git a/INSTALL b/INSTALL index 00c026aa0..6ed61c930 100644 --- a/INSTALL +++ b/INSTALL @@ -116,9 +116,6 @@ the directory base where you installed the gpm package. =optional parameter, then the subshell support is turned off by default. To turn it on, specify the `-U' option to the program. -`--with-termnet' - Enables the network support with the Term package. - `--with-tm-x-support' This option enables minimal X Window support in the text edition. It enables MC to query the status of the modifiers CONTROL and SHIFT diff --git a/NEWS b/NEWS index 5dd0344b6..e5395c58d 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,7 @@ Changes made after 4.6.0-pre1. - Polish manual has been added. - glib is now properly detected on FreeBSD. - New syntax rules - RPM specfile. +- Termnet support has heen removed. Version 4.6.0-pre1. diff --git a/acinclude.m4 b/acinclude.m4 index 455a41371..ea782e4c6 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -39,8 +39,6 @@ dnl MC_VFS_CHECKS dnl Check for various functions needed by libvfs. dnl This has various effects: dnl Sets MC_VFS_LIBS to libraries required -dnl Sets termnet to true or false depending on whether it is required. -dnl If yes, defines USE_TERMNET. dnl Sets vfs_flags to "pretty" list of vfs implementations we include. dnl Sets shell variable use_vfs to yes (default, --with-vfs) or dnl "no" (--without-vfs). @@ -157,20 +155,6 @@ AC_DEFUN([MC_WITH_VFS],[ ) fi - dnl - dnl The termnet support - dnl - termnet=false - AC_ARG_WITH(termnet, - [--with-termnet If you want a termified net support],[ - if test x$withval = xyes; then - AC_DEFINE(USE_TERMNET, 1, - [Define to enable `term' firewall support]) - termnet=true - fi - ]) - - TERMNET="" AC_DEFINE(USE_VFS, 1, [Define to enable VFS support]) if $use_net_code; then AC_DEFINE(USE_NETCODE, 1, [Define to use networked VFS]) @@ -178,12 +162,8 @@ AC_DEFUN([MC_WITH_VFS],[ mcserv= if test $have_socket = yes; then mcserv="mcserv" - if $termnet; then - TERMNET="-ltermnet" - fi fi - AC_SUBST(TERMNET) AC_SUBST(mcserv) dnl FIXME: diff --git a/src/Makefile.am b/src/Makefile.am index 21fcd8af3..c4f834a3e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -36,7 +36,7 @@ endif endif mc_LDADD = $(EDITLIB) $(SLANGLIB) $(VFSLIB) \ - $(INTLLIBS) $(TERMNET) $(GLIB_LIBS) $(MCLIBS) $(LIBICONV) + $(INTLLIBS) $(GLIB_LIBS) $(MCLIBS) $(LIBICONV) CHARSET_SRC = charsets.c charsets.h selcodepage.c selcodepage.h diff --git a/src/textconf.c b/src/textconf.c index dad13d3c6..7fb12e684 100644 --- a/src/textconf.c +++ b/src/textconf.c @@ -35,9 +35,6 @@ static const char * const features [] = { # ifdef WITH_MCFS N_(", mcfs"), # endif -# ifdef USE_TERMNET - N_(" (with termnet support)"), -# endif # ifdef WITH_SMBFS N_(", smbfs"), # endif diff --git a/vfs/Makefile.am b/vfs/Makefile.am index 8c4861f0d..716f6f8e9 100644 --- a/vfs/Makefile.am +++ b/vfs/Makefile.am @@ -102,7 +102,7 @@ endif mcserv_SOURCES = mcserv.c tcputil.c -mcserv_LDADD = $(TERMNET) $(PAMLIBS) $(LCRYPT) $(GLIB_LIBS) +mcserv_LDADD = $(PAMLIBS) $(LCRYPT) $(GLIB_LIBS) SAMBA_DIST = \ Makefile.in \ diff --git a/vfs/ftpfs.c b/vfs/ftpfs.c index 653091eca..bea41ecfb 100644 --- a/vfs/ftpfs.c +++ b/vfs/ftpfs.c @@ -69,10 +69,6 @@ What to do with this? #include #include -#ifdef USE_TERMNET -#include -#endif - #include "utilvfs.h" #include "xdirentry.h" diff --git a/vfs/mcfs.c b/vfs/mcfs.c index 255c8624a..ae9c14b40 100644 --- a/vfs/mcfs.c +++ b/vfs/mcfs.c @@ -39,10 +39,6 @@ #include /* struct in_addr */ #include -#ifdef USE_TERMNET -#include -#endif - #include "utilvfs.h" #include "vfs.h" diff --git a/vfs/tcputil.c b/vfs/tcputil.c index 951643394..97bb5e7f2 100644 --- a/vfs/tcputil.c +++ b/vfs/tcputil.c @@ -38,10 +38,6 @@ #endif #endif -#ifdef USE_TERMNET -#include -#endif - #include #include "tcputil.h" #include "../src/dialog.h" /* for message () */ diff --git a/vfs/utilvfs.c b/vfs/utilvfs.c index a3cded10d..e614994aa 100644 --- a/vfs/utilvfs.c +++ b/vfs/utilvfs.c @@ -35,9 +35,6 @@ #include #include #include -#ifdef USE_TERMNET -#include -#endif #include #include "utilvfs.h"