[PATCH] configure: remove useless automake variable

Tiago Vignatti tiago.vignatti at nokia.com
Mon Nov 23 07:00:06 PST 2009


Xvesa was gone in commit 6d21fbf0 and this should be there as well.

Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
---
 configure.ac               |   11 -----------
 include/kdrive-config.h.in |    3 ---
 2 files changed, 0 insertions(+), 14 deletions(-)

diff --git a/configure.ac b/configure.ac
index f22ac9a..bc437dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1958,16 +1958,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
@@ -2046,7 +2036,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
 
-- 
1.6.0.4



More information about the xorg-devel mailing list