Make RGB_PATH configurable.
Move I2C modules back to $(moduledir)/multimedia.
This commit is contained in:
parent
a65c579613
commit
94fbdb5c6d
|
@ -1,3 +1,12 @@
|
|||
2005-09-01 Daniel Stone <daniel@freedesktop.org>
|
||||
|
||||
* configure.ac:
|
||||
* include/config.h.in:
|
||||
Make RGB_PATH configurable.
|
||||
|
||||
* hw/xfree86/i2c/Makefile.am:
|
||||
Move I2C modules back to $(moduledir)/multimedia.
|
||||
|
||||
2005-08-30 Kristian Høgsberg <krh@redhat.com>
|
||||
|
||||
* hw/xfree86/dri/Makefile.am:
|
||||
|
|
|
@ -214,6 +214,9 @@ AC_ARG_WITH(default-font-path, [ --with-default-font-path=PATH ],
|
|||
AC_ARG_WITH(xkb-path, [ --with-xkb-path=PATH ],
|
||||
[ XKBPATH="$withval" ],
|
||||
[ XKBPATH="${datadir}/X11/xkb" ])
|
||||
AC_ARG_WITH(rgb-path, [ --with-rgb-path=PATH ],
|
||||
[ RGBPATH="$withval" ],
|
||||
[ RGBPATH="${datadir}/X11/rgb" ])
|
||||
|
||||
dnl Extensions.
|
||||
AC_ARG_ENABLE(composite, [ --disable-composite ], [COMPOSITE=$enableval], [COMPOSITE=yes])
|
||||
|
@ -444,7 +447,8 @@ if test "x$USE_RGB_BUILTIN" = xyes; then
|
|||
AC_DEFINE(USE_RGB_BUILTIN, 1, [Use built-in RGB color database])
|
||||
fi
|
||||
|
||||
AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, ["$FONTPATH"], [Default font path])
|
||||
AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, FONTPATH, [Default font path])
|
||||
AC_DEFINE_DIR(RGB_PATH, 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])
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
module_LTLIBRARIES = \
|
||||
multimediadir = $(moduledir)/multimedia
|
||||
multimedia_LTLIBRARIES = \
|
||||
libi2c.la \
|
||||
bt829_drv.la \
|
||||
fi1236_drv.la \
|
||||
|
|
|
@ -388,4 +388,7 @@
|
|||
/* Define to 1 if unsigned long is 64 bits. */
|
||||
#undef _XSERVER64
|
||||
|
||||
/* Define to location of RGB database */
|
||||
#undef RGB_PATH
|
||||
|
||||
#endif /* _DIX_CONFIG_H_ */
|
||||
|
|
Loading…
Reference in New Issue