diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2013-01-06 11:29:17 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-01-09 00:13:29 +0100 |
| commit | 73a84a6972a062f1b3212e92d91d4b186460c784 (patch) | |
| tree | 98e2797a7a8019eac678c84267471c6db73e7a86 /package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | |
| parent | 208a81be5b8ecf3108f1f1490a655288a2e7f56a (diff) | |
| download | buildroot-novena-73a84a6972a062f1b3212e92d91d4b186460c784.tar.gz buildroot-novena-73a84a6972a062f1b3212e92d91d4b186460c784.zip | |
xserver_xorg-server: rename server-style configuration options
The BR2_PACKAGE_XSERVER_xorg and BR2_PACKAGE_XSERVER_tinyx options
used to select the style of X.org server to use are not named
consistently with the rest of the Buildroot options (in capital
letters and prefixed with the package name).
Therefore, we rename those options, and we take care to add the old
option names in the BR2_LEGACY infrastructure.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/x11r7/xserver_xorg-server/xserver_xorg-server.mk')
| -rw-r--r-- | package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index ed5b904ff..623b25d9a 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -62,14 +62,14 @@ XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \ --with-fontdir=/usr/share/fonts/X11/ --localstatedir=/var \ --$(if $(BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB),en,dis)able-xvfb -ifeq ($(BR2_PACKAGE_XSERVER_xorg),y) +ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y) XSERVER_XORG_SERVER_CONF_OPT += --enable-xorg XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libpciaccess libdrm else XSERVER_XORG_SERVER_CONF_OPT += --disable-xorg endif -ifeq ($(BR2_PACKAGE_XSERVER_tinyx),y) +ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE),y) XSERVER_XORG_SERVER_CONF_OPT += --enable-kdrive --enable-xfbdev \ --disable-glx --disable-dri --disable-xsdl define XSERVER_CREATE_X_SYMLINK @@ -133,7 +133,7 @@ ifneq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),y) XSERVER_XORG_SERVER_CONF_OPT += --disable-composite endif -ifeq ($(BR2_PACKAGE_XSERVER_xorg),y) +ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y) ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y) XSERVER_XORG_SERVER_DEPENDENCIES += xproto_dri2proto XSERVER_XORG_SERVER_CONF_OPT += --enable-dri2 |