From 089b4272cf32fc9429c1a0e666c2ffb34fda0b93 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Sun, 11 Sep 2005 01:16:14 +0000 Subject: [PATCH] =?UTF-8?q?use=20RGB=5FDB=20not=20RGB=5FPATH=20as=20that's?= =?UTF-8?q?=20what=20it's=20looking=20for=20define=20HAVE=5FXKB=5FCONFIG?= =?UTF-8?q?=5FH=20so=20setting=20xkb-path=20works=20(J=C3=BCrg=20Billeter)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChangeLog | 6 ++++++ configure.ac | 2 +- xkb/Makefile.am | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e4acef8d7..161c42506 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-09-09 Jürg Billeter + + * configure.ac: use RGB_DB not RGB_PATH as that's what it's looking for + + * xkb/Makefile.am: define HAVE_XKB_CONFIG_H so setting xkb-path works + 2005-09-02 Alan Coopersmith * configure.ac: diff --git a/configure.ac b/configure.ac index 136852447..91af62394 100644 --- a/configure.ac +++ b/configure.ac @@ -447,7 +447,7 @@ if test "x$USE_RGB_BUILTIN" = xyes; then fi AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, FONTPATH, [Default font path]) -AC_DEFINE_DIR(RGB_PATH, RGBPATH, [Default RGB path]) +AC_DEFINE_DIR(RGB_DB, RGBPATH, [Default RGB path]) AC_DEFINE_UNQUOTED(XVENDORNAME, ["$VENDOR_STRING"], [Vendor name]) AC_DEFINE_UNQUOTED(XORG_RELEASE, ["$VENDOR_RELEASE"], [Vendor release]) AC_DEFINE_UNQUOTED(BUILDERADDR, ["$BUILDERADDR"], [Builder address]) diff --git a/xkb/Makefile.am b/xkb/Makefile.am index 6ec34c97e..da92b5288 100644 --- a/xkb/Makefile.am +++ b/xkb/Makefile.am @@ -1,6 +1,7 @@ noinst_LTLIBRARIES = libxkb.la libxkbstubs.la -AM_CFLAGS = $(DIX_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) \ + -DHAVE_XKB_CONFIG_H DDX_SRCS = \ ddxBeep.c \