Commit 190c2adf authored by Eric Anholt's avatar Eric Anholt Committed by Adam Jackson

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's avatarPeter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone's avatarDaniel Stone <daniels@collabora.com>
Signed-off-by: Eric Anholt's avatarEric Anholt <eric@anholt.net>
parent 5c7ed785
......@@ -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'
......
......@@ -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
......
......@@ -23,8 +23,8 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include <xcb/xcb_keysyms.h>
......
......@@ -25,8 +25,8 @@
*
*/
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include "ephyr.h"
......
......@@ -21,8 +21,8 @@
* IN THE SOFTWARE.
*/
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include "kdrive.h"
......
......@@ -24,8 +24,8 @@
* Adam Jackson <ajax@redhat.com>
*/
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include "ephyr.h"
#include "ephyrlog.h"
......
......@@ -23,8 +23,8 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include "ephyr.h"
#include "ephyrlog.h"
......
......@@ -26,8 +26,8 @@
* Dodji Seketeli <dodji@openedhand.com>
*/
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include <string.h>
#include <X11/extensions/Xv.h>
......
......@@ -23,8 +23,8 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include "hostx.h"
......
......@@ -23,8 +23,8 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include "ephyr.h"
......
......@@ -20,8 +20,8 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include "kdrive.h"
......
......@@ -20,8 +20,8 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include "kdrive.h"
#include <mivalidate.h>
......
......@@ -20,8 +20,8 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include "kdrive.h"
......
......@@ -21,8 +21,9 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#include <xkb-config.h>
#endif
#include "kdrive.h"
#include "inputstr.h"
......
......@@ -21,8 +21,8 @@
* Author: Keith Packard, SuSE, Inc.
*/
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include "kdrive.h"
......
......@@ -20,8 +20,8 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include "kdrive.h"
......
......@@ -35,8 +35,8 @@ of the copyright holder.
*/
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include "kdrive.h"
......
/* kdrive-config.h.in: not at all generated. -*- c -*-
*/
#ifndef _KDRIVE_CONFIG_H_
#define _KDRIVE_CONFIG_H_
#include <dix-config.h>
#include <xkb-config.h>
/* 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_ */
......@@ -97,10 +97,6 @@ SOFTWARE.
#undef DPMSExtension
#endif
#ifdef HAVE_KDRIVE_CONFIG_H
#include <kdrive-config.h>
#endif
#ifdef HAVE_XGL_CONFIG_H
#include <xgl-config.h>
#endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment