From 190c2adf4a237a4c0dc13d7566ca91662271d3e4 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 22 Mar 2017 15:11:32 -0700 Subject: [PATCH] kdrive: Drop kdrive-config.h. It had nothing left in it that was used but wasn't in dix-config.h. Reviewed-by: Peter Hutterer Reviewed-by: Daniel Stone Signed-off-by: Eric Anholt --- configure.ac | 7 +------ hw/kdrive/ephyr/Makefile.am | 1 + hw/kdrive/ephyr/ephyr.c | 4 ++-- hw/kdrive/ephyr/ephyr_draw.c | 4 ++-- hw/kdrive/ephyr/ephyr_glamor_xv.c | 4 ++-- hw/kdrive/ephyr/ephyrcursor.c | 4 ++-- hw/kdrive/ephyr/ephyrinit.c | 4 ++-- hw/kdrive/ephyr/ephyrvideo.c | 4 ++-- hw/kdrive/ephyr/hostx.c | 4 ++-- hw/kdrive/ephyr/os.c | 4 ++-- hw/kdrive/src/kcmap.c | 4 ++-- hw/kdrive/src/kdrive.c | 4 ++-- hw/kdrive/src/kinfo.c | 4 ++-- hw/kdrive/src/kinput.c | 5 +++-- hw/kdrive/src/kmode.c | 4 ++-- hw/kdrive/src/kshadow.c | 4 ++-- hw/kdrive/src/kxv.c | 4 ++-- include/kdrive-config.h.in | 25 ------------------------- mi/miinitext.c | 4 ---- 19 files changed, 33 insertions(+), 65 deletions(-) delete mode 100644 include/kdrive-config.h.in diff --git a/configure.ac b/configure.ac index 2a066e2da..3bc15a81a 100644 --- a/configure.ac +++ b/configure.ac @@ -67,8 +67,6 @@ dnl xkb-config.h covers XKB for the Xorg and Xnest DDXs. AC_CONFIG_HEADERS(include/xkb-config.h) dnl xwin-config.h covers the XWin DDX. AC_CONFIG_HEADERS(include/xwin-config.h) -dnl kdrive-config.h covers the kdrive DDX -AC_CONFIG_HEADERS(include/kdrive-config.h) dnl version-config.h covers the version numbers so they can be bumped without dnl forcing an entire recompile.x AC_CONFIG_HEADERS(include/version-config.h) @@ -2369,9 +2367,6 @@ XEPHYR_INCS= AM_CONDITIONAL(KDRIVE, [test x$KDRIVE = xyes]) if test "$KDRIVE" = yes; then - AC_DEFINE(KDRIVESERVER,1,[Build Kdrive X server]) - AC_DEFINE(KDRIVEDDXACTIONS,,[Build kdrive ddx]) - XEPHYR_REQUIRED_LIBS="xau xdmcp xcb xcb-shape xcb-render xcb-renderutil xcb-aux xcb-image xcb-icccm xcb-shm xcb-keysyms xcb-randr xcb-xkb" if test "x$XV" = xyes; then XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xcb-xv" @@ -2399,7 +2394,7 @@ if test "$KDRIVE" = yes; then KDRIVE_OS_INC='-I$(top_srcdir)/hw/kdrive/linux' KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC" - KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H" + KDRIVE_CFLAGS="$XSERVER_CFLAGS" KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $OS_LIB" KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.la' diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am index 6ce0d6fa0..f4bd060f8 100644 --- a/hw/kdrive/ephyr/Makefile.am +++ b/hw/kdrive/ephyr/Makefile.am @@ -26,6 +26,7 @@ AM_CPPFLAGS = \ @KDRIVE_CFLAGS@ \ @XEPHYR_INCS@ \ @XEPHYR_CFLAGS@ \ + -DHAVE_DIX_CONFIG_H \ -I$(top_srcdir) \ -I$(top_srcdir)/glamor \ -I$(top_srcdir)/exa diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c index ef5350e18..546a76c24 100644 --- a/hw/kdrive/ephyr/ephyr.c +++ b/hw/kdrive/ephyr/ephyr.c @@ -23,8 +23,8 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DIX_CONFIG_H +#include #endif #include diff --git a/hw/kdrive/ephyr/ephyr_draw.c b/hw/kdrive/ephyr/ephyr_draw.c index 66371334a..64e07a7d1 100644 --- a/hw/kdrive/ephyr/ephyr_draw.c +++ b/hw/kdrive/ephyr/ephyr_draw.c @@ -25,8 +25,8 @@ * */ -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DIX_CONFIG_H +#include #endif #include "ephyr.h" diff --git a/hw/kdrive/ephyr/ephyr_glamor_xv.c b/hw/kdrive/ephyr/ephyr_glamor_xv.c index b9c3464d8..4dd15cf41 100644 --- a/hw/kdrive/ephyr/ephyr_glamor_xv.c +++ b/hw/kdrive/ephyr/ephyr_glamor_xv.c @@ -21,8 +21,8 @@ * IN THE SOFTWARE. */ -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DIX_CONFIG_H +#include #endif #include "kdrive.h" diff --git a/hw/kdrive/ephyr/ephyrcursor.c b/hw/kdrive/ephyr/ephyrcursor.c index 808b3c72c..f991899c5 100644 --- a/hw/kdrive/ephyr/ephyrcursor.c +++ b/hw/kdrive/ephyr/ephyrcursor.c @@ -24,8 +24,8 @@ * Adam Jackson */ -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DIX_CONFIG_H +#include #endif #include "ephyr.h" #include "ephyrlog.h" diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c index 9794cecc9..383fa9f7c 100644 --- a/hw/kdrive/ephyr/ephyrinit.c +++ b/hw/kdrive/ephyr/ephyrinit.c @@ -23,8 +23,8 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DIX_CONFIG_H +#include #endif #include "ephyr.h" #include "ephyrlog.h" diff --git a/hw/kdrive/ephyr/ephyrvideo.c b/hw/kdrive/ephyr/ephyrvideo.c index 31b1eee31..9c9c78d11 100644 --- a/hw/kdrive/ephyr/ephyrvideo.c +++ b/hw/kdrive/ephyr/ephyrvideo.c @@ -26,8 +26,8 @@ * Dodji Seketeli */ -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DIX_CONFIG_H +#include #endif #include #include diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c index d5578deaa..ef8541673 100644 --- a/hw/kdrive/ephyr/hostx.c +++ b/hw/kdrive/ephyr/hostx.c @@ -23,8 +23,8 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DIX_CONFIG_H +#include #endif #include "hostx.h" diff --git a/hw/kdrive/ephyr/os.c b/hw/kdrive/ephyr/os.c index b481d0a11..12bbc5497 100644 --- a/hw/kdrive/ephyr/os.c +++ b/hw/kdrive/ephyr/os.c @@ -23,8 +23,8 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DIX_CONFIG_H +#include #endif #include "ephyr.h" diff --git a/hw/kdrive/src/kcmap.c b/hw/kdrive/src/kcmap.c index 0970064f6..4fe454551 100644 --- a/hw/kdrive/src/kcmap.c +++ b/hw/kdrive/src/kcmap.c @@ -20,8 +20,8 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DIX_CONFIG_H +#include #endif #include "kdrive.h" diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c index f02d8262b..b2b499669 100644 --- a/hw/kdrive/src/kdrive.c +++ b/hw/kdrive/src/kdrive.c @@ -20,8 +20,8 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DIX_CONFIG_H +#include #endif #include "kdrive.h" #include diff --git a/hw/kdrive/src/kinfo.c b/hw/kdrive/src/kinfo.c index f91d57504..4abb082b0 100644 --- a/hw/kdrive/src/kinfo.c +++ b/hw/kdrive/src/kinfo.c @@ -20,8 +20,8 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DIX_CONFIG_H +#include #endif #include "kdrive.h" diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c index b15375137..39d8af742 100644 --- a/hw/kdrive/src/kinput.c +++ b/hw/kdrive/src/kinput.c @@ -21,8 +21,9 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DIX_CONFIG_H +#include +#include #endif #include "kdrive.h" #include "inputstr.h" diff --git a/hw/kdrive/src/kmode.c b/hw/kdrive/src/kmode.c index ef1b6b4fa..fed4ac5a4 100644 --- a/hw/kdrive/src/kmode.c +++ b/hw/kdrive/src/kmode.c @@ -21,8 +21,8 @@ * Author: Keith Packard, SuSE, Inc. */ -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DIX_CONFIG_H +#include #endif #include "kdrive.h" diff --git a/hw/kdrive/src/kshadow.c b/hw/kdrive/src/kshadow.c index 7f1e2ee19..0cc8a1309 100644 --- a/hw/kdrive/src/kshadow.c +++ b/hw/kdrive/src/kshadow.c @@ -20,8 +20,8 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DIX_CONFIG_H +#include #endif #include "kdrive.h" diff --git a/hw/kdrive/src/kxv.c b/hw/kdrive/src/kxv.c index 844deca0d..035c5e991 100644 --- a/hw/kdrive/src/kxv.c +++ b/hw/kdrive/src/kxv.c @@ -35,8 +35,8 @@ of the copyright holder. */ -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DIX_CONFIG_H +#include #endif #include "kdrive.h" diff --git a/include/kdrive-config.h.in b/include/kdrive-config.h.in deleted file mode 100644 index 59c754be5..000000000 --- a/include/kdrive-config.h.in +++ /dev/null @@ -1,25 +0,0 @@ -/* kdrive-config.h.in: not at all generated. -*- c -*- - */ - -#ifndef _KDRIVE_CONFIG_H_ -#define _KDRIVE_CONFIG_H_ - -#include -#include - -/* Building kdrive server. */ -#undef KDRIVESERVER - -/* Include framebuffer support in X servers */ -#undef KDRIVEFBDEV - -/* Verbose debugging output hilarity */ -#undef DEBUG - -/* Have the backtrace() function. */ -#undef HAVE_BACKTRACE - -/* Have execinfo.h for backtrace(). */ -#undef HAVE_EXECINFO_H - -#endif /* _KDRIVE_CONFIG_H_ */ diff --git a/mi/miinitext.c b/mi/miinitext.c index 5fc44e3f4..9e6578d4a 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -97,10 +97,6 @@ SOFTWARE. #undef DPMSExtension #endif -#ifdef HAVE_KDRIVE_CONFIG_H -#include -#endif - #ifdef HAVE_XGL_CONFIG_H #include #endif