diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-10-16 10:26:21 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-10-20 13:32:14 +1000 |
| commit | ff3e171568c8b604fc5eacd5f7e9b7ee9417f172 (patch) | |
| tree | b8ae50b64ac479ed7f67089a5ce26dc7ea9cf337 /xkb | |
| parent | 0b9dbd4bf2d1061514bebd28648538a5fc0b60e6 (diff) | |
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>
Diffstat (limited to 'xkb')
| -rw-r--r-- | xkb/Makefile.am | 3 | ||||
| -rw-r--r-- | xkb/ddxLoad.c | 2 | ||||
| -rw-r--r-- | xkb/xkbInit.c | 2 |
3 files changed, 1 insertions, 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 <dix-config.h> #endif -#ifdef HAVE_XKB_CONFIG_H #include <xkb-config.h> -#endif #include <stdio.h> #include <ctype.h> 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 <dix-config.h> #endif -#ifdef HAVE_XKB_CONFIG_H #include <xkb-config.h> -#endif #include <stdio.h> #include <stdlib.h> |