From ff3e171568c8b604fc5eacd5f7e9b7ee9417f172 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 16 Oct 2009 10:26:21 +1000 Subject: [PATCH] xkb: don't conditionally include xkb-config.h. If HAVE_XKB_CONFIG_H is ever undefined, we fail to build anyway. Signed-off-by: Peter Hutterer --- xkb/Makefile.am | 3 +-- xkb/ddxLoad.c | 2 -- xkb/xkbInit.c | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/xkb/Makefile.am b/xkb/Makefile.am index b85ee8a41..e54ce59f0 100644 --- a/xkb/Makefile.am +++ b/xkb/Makefile.am @@ -1,7 +1,6 @@ noinst_LTLIBRARIES = libxkb.la libxkbstubs.la -AM_CFLAGS = $(DIX_CFLAGS) \ - -DHAVE_XKB_CONFIG_H +AM_CFLAGS = $(DIX_CFLAGS) DDX_SRCS = \ ddxBeep.c \ diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c index ba8d50b19..72aff2ac0 100644 --- a/xkb/ddxLoad.c +++ b/xkb/ddxLoad.c @@ -28,9 +28,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #endif -#ifdef HAVE_XKB_CONFIG_H #include -#endif #include #include diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c index 747c913f3..3d0fb0014 100644 --- a/xkb/xkbInit.c +++ b/xkb/xkbInit.c @@ -28,9 +28,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #endif -#ifdef HAVE_XKB_CONFIG_H #include -#endif #include #include