diff --git a/ChangeLog b/ChangeLog
index 2a8c8bd1c..f74ba627d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2001-09-10  Pavel Roskin  <proski@gnu.org>
 
+	* configure.in: Only check for X if --with-tm-x-support has been
+	specified.
+
 	* configure.in: Add check for sys/ioctl.h.
 
 	* configure.in: Use AC_FUNC_STRCOLL instead of generic test.
diff --git a/configure.in b/configure.in
index 61f04d4b6..39deeb55e 100644
--- a/configure.in
+++ b/configure.in
@@ -194,8 +194,6 @@ AC_FUNC_MMAP
 AC_FUNC_ALLOCA
 AC_FUNC_STRCOLL
 
-AC_PATH_XTRA
-
 dnl
 dnl X11 support.
 dnl
@@ -210,6 +208,7 @@ textmode_x11_support="no"
 AC_ARG_WITH(tm-x-support,
 	[--with-tm-x-support        Try getting events from X Window System],
 	[if test x$withval = xyes; then
+		AC_PATH_XTRA
 		MCCFLAGS="$X_CFLAGS"
 		MCLIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
 		AC_DEFINE(HAVE_TEXTMODE_X11_SUPPORT, 1,