* extraconf.h: Remove all references to HAVE_X.

* acinclude.m4: s/GNOME_/MC_/
* configure.in: Likewise.  Remove or clarify all references to
the "text edition".  Minor fixes.

ChangeLog

@@ -1,5 +1,10 @@
 2001-08-24  Pavel Roskin  <proski@gnu.org>
 
+	* extraconf.h: Remove all references to HAVE_X.
+	* acinclude.m4: s/GNOME_/MC_/
+	* configure.in: Likewise.  Remove or clarify all references to
+	the "text edition".  Minor fixes.
+
 	* configure.in: Remove support for curses libraries other than
 	ncurses.
 	* acinclude.m4: Likewise.

acinclude.m4

@@ -1,10 +1,10 @@
-dnl GNOME_UNDELFS_CHECKS
+dnl MC_UNDELFS_CHECKS
 dnl    Check for ext2fs undel support.
 dnl    Set shell variable ext2fs_undel to "yes" if we have it,
 dnl    "no" otherwise.  May define USE_EXT2FSLIB for cpp.
 dnl    Will set EXT2FS_UNDEL_LIBS to required libraries.
 
-AC_DEFUN([GNOME_UNDELFS_CHECKS], [
+AC_DEFUN([MC_UNDELFS_CHECKS], [
   ext2fs_undel=no
   EXT2FS_UNDEL_LIBS=
   AC_CHECK_HEADERS(linux/ext2_fs.h)
@@ -23,10 +23,10 @@ AC_DEFUN([GNOME_UNDELFS_CHECKS], [
 
 
 
-dnl GNOME_VFS_CHECKS
+dnl MC_VFS_CHECKS
 dnl   Check for various functions needed by libvfs.
 dnl   This has various effects:
-dnl     Sets GNOME_VFS_LIBS to libraries required
+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.
@@ -35,7 +35,7 @@ dnl        "no" (--without-vfs).
 dnl     Calls AC_SUBST(mcserv), which is either empty or "mcserv".
 
 dnl Private define
-AC_DEFUN([GNOME_WITH_VFS],[
+AC_DEFUN([MC_WITH_VFS],[
   dnl FIXME: network checks should probably be in their own macro.
   AC_CHECK_LIB(nsl, t_accept)
   AC_CHECK_LIB(socket, socket)
@@ -130,20 +130,20 @@ AC_DEFUN([GNOME_WITH_VFS],[
   AC_SUBST(mcserv)
 
 dnl FIXME:
-dnl GNOME_VFS_LIBS=
+dnl MC_VFS_LIBS=
 
 ])
 
 
 
-AC_DEFUN([GNOME_VFS_CHECKS],[
+AC_DEFUN([MC_VFS_CHECKS],[
 	use_vfs=yes
 	AC_ARG_WITH(vfs,
 		[--with-vfs		   Compile with the VFS code],
 		use_vfs=$withval
 	)
 	case $use_vfs in
-		yes) 	GNOME_WITH_VFS;;
+		yes) 	MC_WITH_VFS;;
 		no) 	use_vfs=no;;
 		*)   	use_vfs=no;;
 			dnl Should we issue a warning?
@@ -696,7 +696,7 @@ AC_DEFUN([AC_WITH_EDIT], [
 ])
 
 AC_DEFUN([AC_EXT2_UNDEL], [
-  GNOME_UNDELFS_CHECKS
+  MC_UNDELFS_CHECKS
   if test "$ext2fs_undel" = yes; then
      AC_MSG_RESULT([With ext2fs file recovery code])
      vfs_flags="${vfs_flags}, undelfs"

configure.in

@@ -18,9 +18,10 @@ AC_PROG_AWK
 AC_AIX
 AC_MINIX
 AC_ISC_POSIX
-dnl It's a hack to accomodate both Autoconf 2.13 and the 2.49x series,
+
-dnl It's needed until Autoconf 2.50 is released.
+dnl Accomodate both Autoconf 2.13 and the 2.5x series,
 ifdef([AC_PROG_CC_STDC], [AC_PROG_CC_STDC], [AM_PROG_CC_STDC])
+
 AC_HEADER_MAJOR
 AC_C_CONST
 
@@ -213,10 +214,10 @@ AC_FUNC_ALLOCA
 AC_PATH_XTRA
 
 dnl
-dnl X11 support in the textmode edition. 
+dnl X11 support.
 dnl
 
-dnl These variables are only used when building the text edition MC binary
+dnl These variables are only used when building the MC binary
 MCCFLAGS=""
 MCLIBS=""
 AC_SUBST(MCCFLAGS)
@@ -224,7 +225,7 @@ AC_SUBST(MCLIBS)
 
 textmode_x11_support="no"
 AC_ARG_WITH(tm-x-support,
-	[--with-tm-x-support        Add X Window System support to the text edition],
+	[--with-tm-x-support        Try getting events from X Window System],
 	[if test x$withval = xyes; then
 		MCCFLAGS="$X_CFLAGS"
 		MCLIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
@@ -271,7 +272,7 @@ AC_CHECK_LIB(seq, get_process_stats, [
 	LIBS="$LIBS -lseq"
 	AC_DEFINE(HAVE_GET_PROCESS_STATS)])
 
-GNOME_VFS_CHECKS
+MC_VFS_CHECKS
 
 dnl
 dnl Install mcserv only if explicitly enabled
@@ -691,7 +692,7 @@ EOF
   egrep "VERSION:" >conftest.out 2>&1; then
             ncurses_version=`cat conftest.out|sed -e 's/^[[^"]]*"//' -e 's/".*//'`
 	fi
-	rm -rf conftext*
+	rm -rf conftest*
         AC_MSG_RESULT([$ncurses_version])
 	case "$ncurses_version" in
 	4.[[01]])
@@ -828,8 +829,7 @@ AC_SUBST_FILE(MCF)
 dnl
 dnl Output configuration files
 dnl
-dnl It's a hack to accomodate both Autoconf 2.13 and the 2.49x series,
+dnl Accomodate both Autoconf 2.13 and the 2.5x series.
-dnl It's needed until Autoconf 2.50 is released.
 ifelse(AC_ACVERSION, [2.13],
 [mc_subdirs=
 if test "x$SAMBAFILES" != x; then
@@ -885,17 +885,16 @@ echo "
 Configuration:
 
   Source code location:       ${srcdir}
-  Compiler:	              ${CC}
+  Compiler:                   ${CC}
   Compiler flags:             ${CFLAGS}
   File system:                ${vfs_type}
-			      ${vfs_flags}
+                              ${vfs_flags}
-  Text mode screen manager:   ${screen_manager}
+  Screen manager:             ${screen_manager}
   Install console saver:      ${install_saver}
-  Text mode mouse library:    ${mouse_lib}
+  Mouse support:              ${mouse_lib}
-  Text mode X11 support:      ${textmode_x11_support}
+  X11 events support:         ${textmode_x11_support}
   Debugger code:              ${mem_debug}
   With subshell support:      ${subshell}
-  X11 versions:               ${xvers}
   Internal editor:            ${EDIT_msg}
-  Install path:		      ${prefix}/bin, ${prefix}/lib/mc
+  Install path:               ${prefix}/bin, ${prefix}/lib/mc
 "

extraconf.h

@@ -53,21 +53,12 @@ the need to embed this logic into configure.in.
 #endif
 #endif
 
-#ifdef HAVE_X
-#    undef HAVE_SUBSHELL_SUPPORT
-#    undef HAVE_SLANG
-#    undef HAS_CURSES
-#    undef USE_NCURSES
-#    undef HAVE_CHARSET
-#    undef HAVE_TEXTMODE_X11_SUPPORT
-#endif
-
 #ifndef USE_VFS
 #    undef USE_NETCODE
 #    undef USE_EXT2FSLIB
 #endif
 
-#if defined (HAVE_SOCKETPAIR) && !defined (HAVE_X)
+#ifdef HAVE_SOCKETPAIR
 #    define WITH_BACKGROUND
 #endif