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 <peter.hutterer@who-t.net>
This commit is contained in:
parent
0b9dbd4bf2
commit
ff3e171568
|
@ -1,7 +1,6 @@
|
||||||
noinst_LTLIBRARIES = libxkb.la libxkbstubs.la
|
noinst_LTLIBRARIES = libxkb.la libxkbstubs.la
|
||||||
|
|
||||||
AM_CFLAGS = $(DIX_CFLAGS) \
|
AM_CFLAGS = $(DIX_CFLAGS)
|
||||||
-DHAVE_XKB_CONFIG_H
|
|
||||||
|
|
||||||
DDX_SRCS = \
|
DDX_SRCS = \
|
||||||
ddxBeep.c \
|
ddxBeep.c \
|
||||||
|
|
|
@ -28,9 +28,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
#include <dix-config.h>
|
#include <dix-config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_XKB_CONFIG_H
|
|
||||||
#include <xkb-config.h>
|
#include <xkb-config.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
|
|
@ -28,9 +28,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
#include <dix-config.h>
|
#include <dix-config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_XKB_CONFIG_H
|
|
||||||
#include <xkb-config.h>
|
#include <xkb-config.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user