From 001cb449d0ccc2000589808d8e757f9f3a78d4c5 Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Mon, 23 Dec 2002 17:02:04 +0000
Subject: [PATCH] * configure.in: Enable X11 support by default, use
 --without-x to disable.

---
 ChangeLog    |  5 +++++
 INSTALL      |  9 +++++----
 NEWS         |  1 +
 configure.in | 23 +++++++++++------------
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a57463826..16deab3b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-23  Pavel Roskin  <proski@gnu.org>
+
+	* configure.in: Enable X11 support by default, use --without-x
+	to disable.
+
 2002-12-19  Pavel Roskin  <proski@gnu.org>
 
 	* syntax/perl.syntax: Add separate context for function
diff --git a/INSTALL b/INSTALL
index 73f0d5e46..d069df2bd 100644
--- a/INSTALL
+++ b/INSTALL
@@ -96,13 +96,14 @@ incomplete, use `configure --help' to get the full list):
      =optional parameter, then the subshell support is turned off by
      default.  To turn it on, specify the `-U' option to the program.
 
-`--with-tm-x-support'
-     This option enables minimal support for X Window System events.
-     It enables MC to query the status of the keyboard modifiers, such
+`--without-x'
+     By default, the Midnight Commander tries to connect to the X Window
+     System events to query the status of the keyboard modifiers, such
      as Control, Shift and Alt, when invoked in a terminal emulator
      under X11.  This is necessary (but not always sufficient) to
      recognize some optional but handy key combinations like Ctrl-Home
-     and Shift-Cursor keys.
+     and Shift-Cursor keys.  Use `--without-x' if the dependency on
+     X11 libraries is not desired.
 
 `--without-vfs'
      This option disables the Virtual File System switch code in the
diff --git a/NEWS b/NEWS
index ee624a696..945f06a19 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,7 @@ Changes made after 4.6.0-pre1.
   parent shell, "mc" is now an alias in all shells, not a function.
 - Behavior of Alt-O is more intuitive now.
 - Internal editor now saves the cursor position in the file.
+- X11 support is now enabled by default, use --without-x to disable.
 
 
 Version 4.6.0-pre1.
diff --git a/configure.in b/configure.in
index ac7c2268f..7a891d760 100644
--- a/configure.in
+++ b/configure.in
@@ -207,20 +207,19 @@ AC_FUNC_STRCOLL
 
 dnl
 dnl X11 support.
+dnl Used to read keyboard modifiers when running under X11.
 dnl
 
-textmode_x11_support="no"
-AC_ARG_WITH(tm-x-support,
-	[  --with-tm-x-support      Get keyboard events from X Window System [[no]]],
-	[if test x$withval = xyes; then
-		AC_PATH_XTRA
-		CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-		MCLIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-		AC_DEFINE(HAVE_TEXTMODE_X11_SUPPORT, 1,
-			  [Define to enable getting events from X Window System])
-		textmode_x11_support="yes"
-	fi
-])
+AC_PATH_XTRA
+if test "x$no_x" == xyes; then
+    textmode_x11_support="no"
+else
+    CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+    MCLIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+    AC_DEFINE(HAVE_TEXTMODE_X11_SUPPORT, 1,
+	      [Define to enable getting events from X Window System])
+    textmode_x11_support="yes"
+fi
 
 dnl
 dnl Network related functions