xserver: Branch 'master'
Keith Packard
keithp at kemper.freedesktop.org
Mon Nov 23 07:55:01 PST 2009
configure.ac | 11 -----------
include/kdrive-config.h.in | 3 ---
2 files changed, 14 deletions(-)
New commits:
commit ec16357edaba23694b12fd234ffa12fd58a73dfa
Author: Tiago Vignatti <tiago.vignatti at nokia.com>
Date: Mon Nov 23 17:00:06 2009 +0200
configure: remove unused kdrive Xvesa config variable
Xvesa was gone in commit 6d21fbf0 and this should be there as well.
Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/configure.ac b/configure.ac
index 417aa4f..6f8441c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1953,16 +1953,6 @@ if test "$KDRIVE" = yes; then
AC_DEFINE(KDRIVESERVER,1,[Build Kdrive X server])
AC_DEFINE(KDRIVEDDXACTIONS,,[Build kdrive ddx])
- AC_CHECK_HEADERS([sys/vm86.h sys/io.h])
- if test "$ac_cv_header_sys_vm86_h" = yes && test "x$KDRIVEVESA" = xauto; then
- KDRIVEVESA=yes
- fi
-
- if test "x$KDRIVEVESA" = xyes; then
- KDRIVEFBDEVLIB=yes
- AC_DEFINE(KDRIVEVESA, 1, [Build VESA-based kdrive servers])
- fi
-
AC_CHECK_HEADERS([linux/fb.h])
if test "$ac_cv_header_linux_fb_h" = yes && test "x$XFBDEV" = xauto; then
XFBDEV=yes
@@ -2041,7 +2031,6 @@ AC_SUBST([KDRIVE_LOCAL_LIBS])
AC_SUBST([KDRIVE_LIBS])
AM_CONDITIONAL(KDRIVELINUX, [test "x$KDRIVELINUX" = xyes])
AM_CONDITIONAL(TSLIB, [test "x$HAVE_TSLIB" = xyes])
-AM_CONDITIONAL(KDRIVEVESA, [test "x$KDRIVEVESA" = xyes])
AM_CONDITIONAL(KDRIVEFBDEV, [test "x$XFBDEV" = xyes])
AM_CONDITIONAL(XEPHYR, [test "x$KDRIVE" = xyes && test "x$XEPHYR" = xyes])
AM_CONDITIONAL(BUILD_KDRIVEFBDEVLIB, [test "x$KDRIVE" = xyes && test "x$KDRIVEFBDEVLIB" = xyes])
diff --git a/include/kdrive-config.h.in b/include/kdrive-config.h.in
index 3bc7792..14efb56 100644
--- a/include/kdrive-config.h.in
+++ b/include/kdrive-config.h.in
@@ -13,9 +13,6 @@
/* Include framebuffer support in X servers */
#undef KDRIVEFBDEV
-/* Include vesa support in X servers */
-#undef KDRIVEVESA
-
/* Enable touchscreen support */
#undef TOUCHSCREEN
More information about the xorg-commit
mailing list