use RGB_DB not RGB_PATH as that's what it's looking for

define HAVE_XKB_CONFIG_H so setting xkb-path works (Jürg Billeter)
This commit is contained in:
Daniel Stone 2005-09-11 01:16:14 +00:00
parent 2f9d01c968
commit 089b4272cf
3 changed files with 9 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2005-09-09 Jürg Billeter <j@bitron.ch>
* 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 <alan.coopersmith@sun.com>
* configure.ac:

View File

@ -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])

View File

@ -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 \