diff --git a/configure b/configure
index e52f2c7..e60a482 100755
--- a/configure
+++ b/configure
@@ -17590,7 +17590,8 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5
+if test "x$no_x" != xyes; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5
 $as_echo_n "checking for XF86VidModeQueryExtension in -lXxf86vm... " >&6; }
 if ${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -17630,11 +17631,11 @@ if test "x$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" = xyes; then :
 
 $as_echo "#define HAVE_XF86VMODE 1" >>confdefs.h
 
-        XXF86VM_LIB="-lXxf86vm"
+			XXF86VM_LIB="-lXxf86vm"
 fi
 
-X_LIBS="$X_LIBS $XXF86VM_LIB -lXext"
-
+	X_LIBS="$X_LIBS $XXF86VM_LIB -lXext"
+fi
 # Check whether --enable-xrender was given.
 if test "${enable_xrender+set}" = set; then :
   enableval=$enable_xrender;
diff --git a/configure.ac b/configure.ac
index 09fc535..bddd509 100644
--- a/configure.ac
+++ b/configure.ac
@@ -452,12 +452,13 @@ AC_SUBST(SRC_FONT)
 dnl
 dnl XFree86extendions
 dnl
-AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryExtension,
-	[ AC_DEFINE(HAVE_XF86VMODE,1,[Define this if you have libXxf86vm installed])
-        XXF86VM_LIB="-lXxf86vm"],,
-	$X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS)
-X_LIBS="$X_LIBS $XXF86VM_LIB -lXext"
-
+if test "x$no_x" != xyes; then
+	AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryExtension,
+		[ AC_DEFINE(HAVE_XF86VMODE,1,[Define this if you have libXxf86vm installed])
+			XXF86VM_LIB="-lXxf86vm"],,
+		$X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS)
+	X_LIBS="$X_LIBS $XXF86VM_LIB -lXext"
+fi
 AC_ARG_ENABLE(xrender,
   [  --enable-xrender        Use XRender extension (future work) [default=disable]],,
   enable_xrender="no")