diff options
author | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-08-11 14:44:45 +0200 |
---|---|---|
committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-08-13 09:48:57 +0200 |
commit | 1c553b25ff9348c00b82849e662a412836f6cde3 (patch) | |
tree | 539675fd4ec638bd7794a3d56615bad47eab00f8 | |
parent | 620c3090efbd7a39390550996f4082c8fde9242d (diff) | |
download | ptxdist-1c553b25ff9348c00b82849e662a412836f6cde3.tar.gz ptxdist-1c553b25ff9348c00b82849e662a412836f6cde3.tar.xz |
[xorg-server] rework options
The xorg-server options in Kconfig have been reworked according to the
state as of 1.6.3. While being there, the dependencies have been
updated, according to the specification in configure.ac.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-rw-r--r-- | rules/xorg-server.in | 468 | ||||
-rw-r--r-- | rules/xorg-server.make | 284 |
2 files changed, 369 insertions, 383 deletions
diff --git a/rules/xorg-server.in b/rules/xorg-server.in index baba948ed..7424fd03b 100644 --- a/rules/xorg-server.in +++ b/rules/xorg-server.in @@ -1,291 +1,259 @@ ## SECTION=multimedia_xorg -# xorg server configuration -# -# Note: Some of the listed dependencies are hardcoded in the configure script -# see configure script line 26250 -# -# REQUIRED_MODULES="randrproto renderproto fixesproto >= 4.0 damageproto xcmiscproto xextproto xproto \ -# xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto scrnsaverproto >= 1.1 bigreqsproto \ -# resourceproto fontsproto inputproto xf86dgaproto" -# REQUIRED_LIBS="xfont xau fontenc" -# menuconfig XORG_SERVER tristate prompt "xorg server " -# Always required: - select XORG_LIB_X11 - select XORG_LIB_XAW - select XORG_LIB_XAU - select XORG_LIB_XTRANS - select XORG_PROTO_RANDR + # + # required dependencies, according to REQUIRED_MODULES + # and REQUIRED_LIBS in conrigure.ac: + # + # protos + select XORG_PROTO_RANDR select XORG_PROTO_RENDER - select XORG_LIB_XRENDER - select XORG_PROTO_FIXES select XORG_PROTO_DAMAGE select XORG_PROTO_XCMISC select XORG_PROTO_XEXT select XORG_PROTO_X - select XORG_PROTO_XF86MISC + select XORG_LIB_XTRANS select XORG_PROTO_BIGREQS - select XORG_PROTO_XF86VIDMODE - select XORG_PROTO_XF86BIGFONT - select XORG_LIB_FONTENC - select XORG_LIB_XFONT - select XORG_LIB_XKBFILE + select XORG_PROTO_RESOURCE + select XORG_PROTO_FONTS + select XORG_PROTO_INPUT + select XORG_PROTO_KB - select LIBC_DL + # libs + select XORG_LIB_XFONT + select XORG_LIB_XAU + select XORG_LIB_FONTENC + select XORG_LIB_XEXT select PIXMAN select OPENSSL -# -# Required on demand -# - select XORG_LIB_XXF86VM if XORG_SERVER_EXT_XV - - select XORG_LIB_XRES if XORG_SERVER_EXT_XRES - - select XORG_LIB_XXF86MISC if XORG_SERVER_EXT_XF86MISC - - select XORG_LIB_XKBUI if XORG_SERVER_OPT_XORGCFG - - select XORG_LIB_XXF86MISC if XORG_SERVER_OPT_XORGCFG - - select XORG_LIB_XAW_V7 if XORG_SERVER_OPT_XORGCFG + select XORG_LIB_XKBFILE -# -# FIXME: required? - select XORG_LIB_XSCRNSAVER if XORG_SERVER_EXT_SCREENSAVER -# - select XORG_PROTO_FONTS - select XORG_PROTO_INPUT - select XORG_LIB_XI - select XORG_LIB_XFONTCACHE - select XORG_LIB_XT - select XORG_LIB_XMU - select XORG_LIB_XTST - select XORG_LIB_XEXT - select XORG_PROTO_FONTCACHE -# - select XORG_PROTO_XF86DRI if XORG_SERVER_EXT_DRI - select DRI2PROTO if XORG_SERVER_EXT_DRI2 -# -# when OpenGL is enabled, MesaLib is required -# + # glx triggered + select XORG_LIB_X11 if XORG_SERVER_EXT_GLX select XORG_PROTO_GL if XORG_SERVER_EXT_GLX select MESALIB if XORG_SERVER_EXT_GLX -# select to choice values doesn't work, see mesalib.in for workaround -# select MESALIB_DRIVER_DRI if XORG_SERVER_EXT_GLX - select LIBDRM if XORG_SERVER_EXT_GLX -# -# select XORG_PROTO_XV - select XORG_LIB_XV if XORG_SERVER_EXT_XV -# - select XORG_LIB_XCOMPOSITE if XORG_SERVER_EXT_COMPOSITE -# select XORG_PROTO_COMPOSITE if XORG_SERVER_EXT_COMPOSITE -# -# - select XORG_PROTO_RECORD if XORG_SERVER_EXT_RECORD -# -# FIXME: required? - select XORG_LIB_XKBUI if XORG_KEYBOARD_MAPPING_SUPPORT - - select XORG_PROTO_XINERAMA if XORG_SERVER_EXT_XINERAMA - - select XORG_PROTO_EVIEEXT if XORG_SERVER_EXT_XEVIE - - select XORG_LIB_XDMCP if XORG_SERVER_EXT_XDMCP - -# configure checks for dmx-proto when checking XDMCP. Why? - select XORG_PROTO_DMX if XORG_SERVER_EXT_XDMCP - - select XORG_LIB_DMX if XORG_SERVER_DMX - -# FIXME seems not to work -# FIXME: There are some configurations where its required. Bit when? - select GCCLIBS_GCC_S - - -# always! Why? - select XORG_PROTO_SCRNSAVER if XORG_SERVER_QUIRKS -# always! Why? - select XORG_PROTO_RESOURCE if XORG_SERVER_QUIRKS -# always! Why? - select XORG_PROTO_XF86DGA if XORG_SERVER_QUIRKS || XORG_SERVER_EXT_DGA -# always! Why? - select XORG_PROTO_VIDEO if XORG_SERVER_QUIRKS - # FIXME: if not enabled, we get this one: - # record.c:46:38: X11/extensions/recordstr.h: No such file or directory -# select XORG_PROTO_RECORD if XORG_SERVER_QUIRKS + # dri triggered + select XORG_PROTO_XF86DRI if XORG_SERVER_EXT_DRI + select XORG_PROTO_GL if XORG_SERVER_EXT_DRI + select MESALIB if XORG_SERVER_EXT_DRI + select LIBDRM if XORG_SERVER_EXT_DRI + + # dri2 triggered + select DRI2PROTO if XORG_SERVER_EXT_DRI2 + select LIBDRM if XORG_SERVER_EXT_DRI2 + + # xdmcp extension + select XORG_LIB_XDMCP if XORG_SERVER_EXT_XDMCP + + # xnest ddx + #select <xfont>? if XORG_SERVER_XNEST + select XORG_LIB_X11 if XORG_SERVER_XNEST + + # xorg ddx + select LIBPCIACCESS if XORG_SERVER_XORG + #select XORG_PROTO_XF86DGA if XORG_SERVER_XORG && XORG_SERVER_EXT_DGA FIXME: broken + select XORG_PROTO_XF86DGA if XORG_SERVER_XORG + select XORG_PROTO_XF86VIDMODE if XORG_SERVER_XORG && XORG_SERVER_EXT_XF86VIDMODE + + # xv triggered + select XORG_PROTO_VIDEO if XORG_SERVER_EXT_XV + select XORG_LIB_XV if XORG_SERVER_EXT_XV + + # composite triggered + select XORG_LIB_XCOMPOSITE if XORG_SERVER_EXT_COMPOSITE + + # record triggered + select XORG_PROTO_RECORD if XORG_SERVER_EXT_RECORD + + # screensaver triggered + select XORG_LIB_XSCRNSAVER if XORG_SERVER_EXT_SCREENSAVER + + # xres triggered + select XORG_LIB_XRES if XORG_SERVER_EXT_XRES + + # xinerama triggered + select XORG_PROTO_XINERAMA if XORG_SERVER_EXT_XINERAMA + + # FIXME: unclear dependencies + #select XORG_LIB_XXF86VM if XORG_SERVER_EXT_XV + #select XORG_LIB_XXF86MISC if XORG_SERVER_EXT_XF86MISC + #select XORG_LIB_XKBUI if XORG_SERVER_OPT_XORGCFG + #select XORG_LIB_XXF86MISC if XORG_SERVER_OPT_XORGCFG + #select XORG_LIB_XAW if XORG_SERVER_OPT_XORGCFG + #select TSLIB if XORG_SERVER_TSLIB + #select XORG_LIB_X11 + #select XORG_LIB_XAW + #select XORG_PROTO_XF86MISC + #select XORG_PROTO_XF86BIGFONT + #select LIBC_DL + #select XORG_LIB_XFONTCACHE + #select XORG_LIB_XT + #select XORG_LIB_XMU + #select XORG_LIB_XTST + #select XORG_PROTO_FONTCACHE + #select XORG_LIB_XKBUI if XORG_KEYBOARD_MAPPING_SUPPORT + #select XORG_PROTO_EVIEEXT if XORG_SERVER_EXT_XEVIE + #select XORG_PROTO_DMX if XORG_SERVER_EXT_XDMCP + # FIXME: find out which config options need this + #select GCCLIBS_GCC_S # FIXME: if not enabled, we get this one: # seems an error. Without DBE its definition will be omitted # (in os/utils.c), but it will always be used in # hw/xfree86/dixmods/dbemodule.c! # dbemodule.c:17: error: `noDbeExtension' undeclared here (not in a function) - select XORG_SERVER_EXT_DBE if XORG_SERVER_QUIRKS + #select XORG_SERVER_EXT_DBE # FIXME: XVMC_[TRUE|FALSE] are ifdefd out if XV is not set! - select XORG_SERVER_EXT_XVMC if XORG_SERVER_QUIRKS && XORG_SERVER_EXT_XV + #select XORG_SERVER_EXT_XVMC if XORG_SERVER_EXT_XV # FIXME: same problem as above - select XORG_SERVER_EXT_XV if XORG_SERVER_QUIRKS - - # FIXME: xorg fails in dix subdirectory if no file based font is enabled - # so at least one must be enabled -# select XORG_LIB_XFONT_PCF_FONTS if XORG_SERVER_QUIRKS + #select XORG_SERVER_EXT_XV # FIXME: xorg fails in dix subdirectory if no connection to font servers # are enabled. - select XORG_LIB_XFONT_FONTSERVER if XORG_SERVER_QUIRKS + #select XORG_LIB_XFONT_FONTSERVER -# # FIXME: do we need this on all platforms? - select LIBPCIACCESS -config XORG_SERVER_QUIRKS - bool - depends on XORG_SERVER - prompt "enable xorg quirks" - default y - help - This option turns on some additional dependencies between the - xorg server and the libraries. These dependencies should not - be there, it is just for showing where currently things with - the build system do not work as expected. +if XORG_SERVER + +#config XORG_SERVER_QUIRKS +# bool +# prompt "enable xorg quirks" +# default y +# help +# This option turns on some additional dependencies between the +# xorg server and the libraries. These dependencies should not +# be there, it is just for showing where currently things with +# the build system do not work as expected. # ---------------------------------------------------------------------------- -comment "*** X.org Servers ***" - depends on XORG_SERVER +menu "xorg servers " config XORG_SERVER_XORG bool - depends on XORG_SERVER - prompt "X.org main server" + prompt "xorg server" help This is the main server to be used for the other video drivers +config XORG_SERVER_KDRIVE + bool + prompt "kdrive server" + help + FIXME + config XORG_SERVER_DMX bool - depends on XORG_SERVER - prompt "X.org DMX server" + depends on BROKEN + prompt "xorg dmx server" help Distributed Multi-head X server. Xdmx is a proxy X server that uses one or more other X servers as its display devices. config XORG_SERVER_XVFB bool - depends on XORG_SERVER - prompt "X.org Xvfb server" + depends on BROKEN + prompt "xorg vfb server" help --enable-xvfb config XORG_SERVER_XNEST bool - depends on XORG_SERVER - prompt "X.org Xnest server" + depends on BROKEN + # required by configure.ac: + select XORG_SERVER_EXT_XDMCP + prompt "xorg xnest server" help A X server working on a running X server. Disadvantage is Xnest supports only features the running X server itself supports. config XORG_SERVER_XWIN bool - depends on XORG_SERVER depends on BROKEN - prompt "X.org XWin server [BROKEN]" + prompt "xwin server [BROKEN]" help X Server for the Cygwin environment on Microsoft Windows config XORG_SERVER_XEPHYR bool - depends on XORG_SERVER - prompt "kdrive's XEPHYR" + depends on BROKEN + prompt "xephyr server" help This server is working on top of a running X server. But instead of Xnest this kind of server supports all new features (extensions). It doesn't depend on the features of the underlying X server. -# ---------------------------------------------------------------------------- - -comment "*** X.org Options ***" - depends on XORG_SERVER - -config XORG_SERVER_OPT_INSTALL_SETUID - depends on XORG_SERVER +config XORG_SERVER_XSDL bool - prompt "Install Xorg server as owned by root with setupd bit" + depends on BROKEN + prompt "xsdl server" help - --enable-install-setuid + FIXME -config XORG_SERVER_OPT_SECURE_RPC - depends on XORG_SERVER +config XORG_SERVER_FAKE bool - prompt "secure RPC" + depends on BROKEN + prompt "fake server" help - Use secure RPC authentication (SUN-DES-1) + FIXME -config XORG_SERVER_OPT_XORGCFG - depends on XORG_SERVER +config XORG_SERVER_XFBDEV bool - prompt "build xorgcfg GUI config utility" + prompt "xfbdev server" help - --enable-xorgcfg + FIXME + +endmenu + +# ---------------------------------------------------------------------------- + +menu "xorg options " -config XORG_SERVER_OPT_KBD_MODE - depends on XORG_SERVER +config XORG_SERVER_OPT_NULL_ROOT_CURSOR bool - prompt "build kbd_mode utility" - help - --enable-kbd_mode + prompt "null root cursor" -menuconfig XORG_SERVER_INT10_HANDLING - depends on XORG_SERVER +config XORG_SERVER_OPT_AIGLX bool - prompt "Select int10 handling " - help - Disabling this entry uses configure's default. This extension can be - used for closed graphic chips. The video BIOS will be called to manipulate - things in the device. + depends on BROKEN + prompt "aiglx" -choice - prompt "Select handling method" - depends on XORG_SERVER_INT10_HANDLING +config XORG_SERVER_STRING_REGISTRY + bool + prompt "string registry" -config XORG_SERVER_INT10_VM86 - depends on XORG_SERVER_INT10_HANDLING +config XORG_SERVER_OPT_INSTALL_SETUID bool - prompt "Use VM86" + prompt "install server suid root" help - Using VM86 for int10. To be used on a real x86 platform with a BIOS. + --enable-install-setuid -config XORG_SERVER_INT10_X86EMU - depends on XORG_SERVER_INT10_HANDLING +config XORG_SERVER_OPT_SECURE_RPC bool - prompt "Use x86emu" + prompt "secure rpc" help - Using x86emu for int10. To be used in a environment that emulates an - x86. + Use secure RPC authentication (SUN-DES-1) -config XORG_SERVER_INT10_STUB - depends on XORG_SERVER_INT10_HANDLING +config XORG_SERVER_TSLIB bool - prompt "Use stub" + prompt "tslib" help - Using stub for int10. To be used if the environment is not a x86 and - does not provide an x86 emulator. + FIXME -endchoice +endmenu # ---------------------------------------------------------------------------- -comment "*** X.org Extensions ***" - depends on XORG_SERVER +menu "xorg extensions " config XORG_SERVER_EXT_COMPOSITE - depends on XORG_SERVER bool prompt "composite extension" default y @@ -293,34 +261,30 @@ config XORG_SERVER_EXT_COMPOSITE --enable-composite config XORG_SERVER_EXT_SHM - depends on XORG_SERVER bool - prompt "SHM extension" + prompt "shm extension" default y help --enable-shm Support for MIT Shared Memoy config XORG_SERVER_EXT_XRES - depends on XORG_SERVER bool - prompt "XRes extension" + prompt "xres extension" default y help --enable-xres config XORG_SERVER_EXT_RECORD - depends on XORG_SERVER bool - prompt "Record extension" + prompt "record extension" default y help --enable-record, The record module adds record extension to capture events that are associated with recording and playback user actions config XORG_SERVER_EXT_XV - depends on XORG_SERVER bool - prompt "Xv extension" + prompt "xv extension" default y help The Xv extension provides support for video adaptors attached to an X @@ -329,17 +293,15 @@ config XORG_SERVER_EXT_XV independent video streams pass config XORG_SERVER_EXT_XVMC - depends on XORG_SERVER bool - prompt "XvMC extension" + prompt "xvmc extension" default y help --enable-xvmc config XORG_SERVER_EXT_DGA - depends on XORG_SERVER bool - prompt "DGA extension" + prompt "dga extension" default y help DGA (Direct Access Graphics mode) is a feature of XFree86 that allows @@ -347,38 +309,42 @@ config XORG_SERVER_EXT_DGA DGA supports the double flickering. config XORG_SERVER_EXT_SCREENSAVER - depends on XORG_SERVER bool - prompt "ScreenSaver extension" + prompt "screensaver extension" default y help --enable-screensaver config XORG_SERVER_EXT_XDMCP - depends on XORG_SERVER bool - prompt "XDMCP extension" + prompt "xdmcp extension" help --enable-xdmcp config XORG_SERVER_EXT_XDMCP_AUTH_1 - depends on XORG_SERVER bool - prompt "XDM-Auth-1 extension" + select XORG_SERVER_EXT_XDMCP + prompt "xdm-auth-1 extension" help --enable-xdmcp config XORG_SERVER_EXT_GLX - depends on XORG_SERVER bool - prompt "GLX extension" + # This select doesn't work! But it is workarounded by mesalib only + # presenting the DRI driver as it's backend if GLX is active. + select MESALIB_DRIVER_DRI + prompt "glx extension" help --enable-glx +config XORG_SERVER_OPT_GLX_TLS + bool + depends on XORG_SERVER_EXT_GLX + prompt "tls support for glx" + config XORG_SERVER_EXT_DRI - depends on XORG_SERVER bool - prompt "DRI extension" + prompt "dri extension" help Enable support for the Direct Rendering Infrastructure to get 3D accelerations support. This is meaningless if you don't have DRI @@ -387,9 +353,8 @@ config XORG_SERVER_EXT_DRI else they try to detect the DRI hardware on your host. config XORG_SERVER_EXT_DRI2 - depends on XORG_SERVER bool - prompt "DRI2 extension" + prompt "dri2 extension" help Enable support for the Direct Rendering Infrastructure 2 to get 3D accelerations support. This is meaningless if you don't have DRI @@ -398,87 +363,70 @@ config XORG_SERVER_EXT_DRI2 else they try to detect the DRI hardware on your host. config XORG_SERVER_EXT_XINERAMA - depends on XORG_SERVER bool - prompt "Xinerama extension" + prompt "xinerama extension" help --enable-xinerama - Support for more than one screen, but handled as one screen config XORG_SERVER_EXT_XF86VIDMODE - depends on XORG_SERVER bool - prompt "XF86VidMode extension" + prompt "xf86vidmode extension" help --enable-xf86vidmode -config XORG_SERVER_EXT_XF86MISC - depends on XORG_SERVER +config XORG_SERVER_EXT_XACE bool - prompt "XF86Misc extension" + prompt "xace" help - --enable-xf86misc + FIXME -config XORG_SERVER_EXT_XCSECURITY - depends on XORG_SERVER - bool - prompt "Security extension" - help - --enable-xcsecurity - -config XORG_SERVER_EXT_XEVIE - depends on XORG_SERVER - bool - prompt "XEvIE extension" - help - --enable-xevie - -config XORG_SERVER_EXT_APPGROUP - depends on XORG_SERVER +config XORG_SERVER_EXT_XSELINUX bool - prompt "XC-APPGROUP extension" + depends on BROKEN + prompt "xselinux" help - --enable-appgroup + FIXME -config XORG_SERVER_EXT_CUP - depends on XORG_SERVER +config XORG_SERVER_EXT_XCSECURITY bool - prompt "TOG-CUP extension" + prompt "xcsecurity" help - --enable-cup + FIXME -config XORG_SERVER_EXT_EVI - depends on XORG_SERVER +config XORG_SERVER_EXT_CALIBRATE bool - prompt "Extended-Visual-Information extension" + depends on BROKEN + # seems to need xcalibrate proto, but there is no release of + # http://cgit.freedesktop.org/xorg/lib/libXCalibrate/ available + prompt "calibrate" help - --enable-evi + FIXME config XORG_SERVER_EXT_MULTIBUFFER - depends on XORG_SERVER bool - prompt "Multibuffer extension" + prompt "multibuffer" help - --enable-multibuffer - -config XORG_SERVER_EXT_FONTCACHE - depends on XORG_SERVER - bool - prompt "FontCache extension" - help - --enable-fontcache + FIXME config XORG_SERVER_EXT_DBE - depends on XORG_SERVER bool - prompt "DBE extension" + prompt "dbe" help - --enable-dbe - Double Buffer Extension for graphic accelaration, - Required for flicker free and smooth animations + FIXME config XORG_SERVER_EXT_DPMS - depends on XORG_SERVER bool - prompt "DPMS extension" + depends on BROKEN + # If enabled, I get this: + # sysroot-target/usr/include/X11/extensions/dpms.h:40: error: expected ')' before '*' token + prompt "dpms" help - Display Power Management Service to control the display monitor + FIXME + +endmenu + +# ---------------------------------------------------------------------------- + +endif + diff --git a/rules/xorg-server.make b/rules/xorg-server.make index f92d8c228..246ec65fe 100644 --- a/rules/xorg-server.make +++ b/rules/xorg-server.make @@ -50,210 +50,204 @@ XORG_SERVER_ENV := $(CROSS_ENV) \ # # autoconf # -# don't put a := here! MESALIB_DIR won't get expanded then +# use "=" here XORG_SERVER_AUTOCONF = \ $(CROSS_AUTOCONF_USR) \ $(XORG_OPTIONS_TRANS) \ - --disable-dependency-tracking \ - --localstatedir=/var \ + --enable-option-checking \ + --disable-maintainer-mode \ + --enable-dependency-tracking \ + --enable-large-file \ + --disable-werror \ + --disable-debug \ + --disable-builddocs \ + --disable-config-dbus \ --disable-config-hal \ - --disable-config-dbus -# -# if no value is given ignore the "--datadir" switch -# -ifneq ($(call remove_quotes,$(PTXCONF_XORG_DEFAULT_DATA_DIR)),) - XORG_SERVER_AUTOCONF += --datadir=$(PTXCONF_XORG_DEFAULT_DATA_DIR) + --disable-xfree86-utils \ + --disable-xquartz \ + --disable-standalone-xpbproxy \ + --localstatedir=/var + +# FIXME +# - what is XORG_OPTIONS_TRANS? +# --enable-shared +# --enable-static +# --enable-install-libxf86config + +# FIXME new options + +ifdef PTXCONF_XORG_SERVER_NULL_ROOT_CURSOR +XORG_SERVER_AUTOCONF += --enable-null-root-cursor +else +XORG_SERVER_AUTOCONF += --disable-null-root-cursor endif -ifdef PTXCONF_XORG_LIB_X11_XF86BIGFONT -XORG_SERVER_AUTOCONF += --enable-xf86bigfont +ifdef PTXCONF_XORG_SERVER_AIGLX +XORG_SERVER_AUTOCONF += --enable-aiglx else -XORG_SERVER_AUTOCONF += --disable-xf86bigfont +XORG_SERVER_AUTOCONF += --disable-aiglx +endif + +ifdef PTXCONF_XORG_SERVER_OPT_GLX_TLS +XORG_SERVER_AUTOCONF += --enable-glx-tls +else +XORG_SERVER_AUTOCONF += --disable-glx-tls +endif + +ifdef PTXCONF_XORG_SERVER_STRING_REGISTRY +XORG_SERVER_AUTOCONF += --enable-registry +else +XORG_SERVER_AUTOCONF += --disable-registry endif -# default is enabled ifdef PTXCONF_XORG_SERVER_EXT_COMPOSITE XORG_SERVER_AUTOCONF += --enable-composite else XORG_SERVER_AUTOCONF += --disable-composite endif -# default is enabled ifdef PTXCONF_XORG_SERVER_EXT_SHM XORG_SERVER_AUTOCONF += --enable-shm else XORG_SERVER_AUTOCONF += --disable-shm endif -# default is enabled ifdef PTXCONF_XORG_SERVER_EXT_XRES XORG_SERVER_AUTOCONF += --enable-xres else XORG_SERVER_AUTOCONF += --disable-xres endif -# default is enabled ifdef PTXCONF_XORG_SERVER_EXT_RECORD XORG_SERVER_AUTOCONF += --enable-record else XORG_SERVER_AUTOCONF += --disable-record endif -# default is enabled ifdef PTXCONF_XORG_SERVER_EXT_XV XORG_SERVER_AUTOCONF += --enable-xv else XORG_SERVER_AUTOCONF += --disable-xv endif -# default is enabled ifdef PTXCONF_XORG_SERVER_EXT_XVMC XORG_SERVER_AUTOCONF += --enable-xvmc else XORG_SERVER_AUTOCONF += --disable-xvmc endif -# default is enabled ifdef PTXCONF_XORG_SERVER_EXT_DGA XORG_SERVER_AUTOCONF += --enable-dga else XORG_SERVER_AUTOCONF += --disable-dga endif -# default is enabled ifdef PTXCONF_XORG_SERVER_EXT_SCREENSAVER XORG_SERVER_AUTOCONF += --enable-screensaver else XORG_SERVER_AUTOCONF += --disable-screensaver endif -# default is auto ifdef PTXCONF_XORG_SERVER_EXT_XDMCP XORG_SERVER_AUTOCONF += --enable-xdmcp else XORG_SERVER_AUTOCONF += --disable-xdmcp endif -# default is auto ifdef PTXCONF_XORG_SERVER_EXT_XDMCP_AUTH_1 XORG_SERVER_AUTOCONF += --enable-xdmcp-auth-1 else XORG_SERVER_AUTOCONF += --disable-xdmcp-auth-1 endif -# default is enabled ifdef PTXCONF_XORG_SERVER_EXT_GLX XORG_SERVER_AUTOCONF += --enable-glx else XORG_SERVER_AUTOCONF += --disable-glx endif -# default is auto ifdef PTXCONF_XORG_SERVER_EXT_DRI XORG_SERVER_AUTOCONF += --enable-dri else XORG_SERVER_AUTOCONF += --disable-dri # if DRI is disabled we do not have AGP -# FIXME: right var? XORG_SERVER_ENV += ac_cv_header_linux_agpgart_h=no endif -# default is auto ifdef PTXCONF_XORG_SERVER_EXT_DRI2 XORG_SERVER_AUTOCONF += --enable-dri2 else XORG_SERVER_AUTOCONF += --disable-dri2 # if DRI is disabled we do not have AGP -# FIXME: right var? XORG_SERVER_ENV += ac_cv_header_linux_agpgart_h=no endif -# default is enabled ifdef PTXCONF_XORG_SERVER_EXT_XINERAMA XORG_SERVER_AUTOCONF += --enable-xinerama else XORG_SERVER_AUTOCONF += --disable-xinerama endif -# default is enabled ifdef PTXCONF_XORG_SERVER_EXT_XF86VIDMODE XORG_SERVER_AUTOCONF += --enable-xf86vidmode else XORG_SERVER_AUTOCONF += --disable-xf86vidmode endif -# default is enabled -ifdef PTXCONF_XORG_SERVER_EXT_XF86MISC -XORG_SERVER_AUTOCONF += --enable-xf86misc +ifdef PTXCONF_XORG_SERVER_EXT_XACE +XORG_SERVER_AUTOCONF += --enable-xace else -XORG_SERVER_AUTOCONF += --disable-xf86misc +XORG_SERVER_AUTOCONF += --disable-xace endif -# default is enabled -ifdef PTXCONF_XORG_SERVER_EXT_XCSECURITY -XORG_SERVER_AUTOCONF += --enable-xcsecurity +ifdef PTXCONF_XORG_SERVER_EXT_XSELINUX +XORG_SERVER_AUTOCONF += --enable-xselinux else -XORG_SERVER_AUTOCONF += --disable-xcsecurity +XORG_SERVER_AUTOCONF += --disable-xselinux endif -# default is enabled -ifdef PTXCONF_XORG_SERVER_EXT_XEVIE -XORG_SERVER_AUTOCONF += --enable-xevie -else -XORG_SERVER_AUTOCONF += --disable-xevie -endif - -# default is enabled -ifdef PTXCONF_XORG_SERVER_EXT_APPGROUP -XORG_SERVER_AUTOCONF += --enable-appgroup +ifdef PTXCONF_XORG_SERVER_EXT_XCSECURITY +XORG_SERVER_AUTOCONF += --enable-xcsecurity else -XORG_SERVER_AUTOCONF += --disable-appgroup +XORG_SERVER_AUTOCONF += --disable-xcsecurity endif -# default is enabled -ifdef PTXCONF_XORG_SERVER_EXT_CUP -XORG_SERVER_AUTOCONF += --enable-cup +ifdef PTXCONF_XORG_SERVER_EXT_CALIBRATE +XORG_SERVER_AUTOCONF += --enable-xcalibrate else -XORG_SERVER_AUTOCONF += --disable-cup +XORG_SERVER_AUTOCONF += --disable-xcalibrate endif -# default is enabled -ifdef PTXCONF_XORG_SERVER_EXT_EVI -XORG_SERVER_AUTOCONF += --enable-evi +ifdef PTXCONF_XORG_SERVER_TSLIB +XORG_SERVER_AUTOCONF += --enable-tslib else -XORG_SERVER_AUTOCONF += --disable-evi +XORG_SERVER_AUTOCONF += --disable-tslib endif -# default is disabled ifdef PTXCONF_XORG_SERVER_EXT_MULTIBUFFER XORG_SERVER_AUTOCONF += --enable-multibuffer else XORG_SERVER_AUTOCONF += --disable-multibuffer endif -# default is disabled -ifdef PTXCONF_XORG_SERVER_EXT_FONTCACHE -XORG_SERVER_AUTOCONF += --enable-fontcache -else -XORG_SERVER_AUTOCONF += --disable-fontcache -endif - -# default is enabled ifdef PTXCONF_XORG_SERVER_EXT_DBE XORG_SERVER_AUTOCONF += --enable-dbe else XORG_SERVER_AUTOCONF += --disable-dbe endif -# default is enabled -ifdef PTXCONF_FREETYPE -XORG_SERVER_AUTOCONF += --enable-freetype +ifdef PTXCONF_XORG_LIB_X11_XF86BIGFONT +XORG_SERVER_AUTOCONF += --enable-xf86bigfont else -XORG_SERVER_AUTOCONF += --disable-freetype +XORG_SERVER_AUTOCONF += --disable-xf86bigfont endif -# -# what kind of server to be built -# + +ifdef PTXCONF_XORG_SERVER_EXT_DPMS +XORG_SERVER_AUTOCONF += --enable-dpms +else +XORG_SERVER_AUTOCONF += --disable-dpms +endif + ifdef PTXCONF_XORG_SERVER_XORG XORG_SERVER_AUTOCONF += --enable-xorg else @@ -284,88 +278,131 @@ else XORG_SERVER_AUTOCONF += --disable-xwin endif +ifdef PTXCONF_XORG_SERVER_KDRIVE +XORG_SERVER_AUTOCONF += --enable-kdrive +else +XORG_SERVER_AUTOCONF += --disable-kdrive +endif + ifdef PTXCONF_XORG_SERVER_XEPHYR XORG_SERVER_AUTOCONF += --enable-xephyr else XORG_SERVER_AUTOCONF += --disable-xephyr endif -ifdef PTXCONF_XORG_SERVER_OPT_INSTALL_SETUID -XORG_SERVER_AUTOCONF += --enable-install-setuid +ifdef PTXCONF_XORG_SERVER_XSDL +XORG_SERVER_AUTOCONF += --enable-xsdl else -XORG_SERVER_AUTOCONF += --disable-install-setuid +XORG_SERVER_AUTOCONF += --disable-xsdl endif -ifdef PTXCONF_XORG_SERVER_OPT_SECURE_RPC -XORG_SERVER_AUTOCONF += --enable-secure-rpc +ifdef PTXCONF_XORG_SERVER_FAKE +XORG_SERVER_AUTOCONF += --enable-fake else -XORG_SERVER_AUTOCONF += --disable-secure-rpc +XORG_SERVER_AUTOCONF += --disable-fake endif -ifdef PTXCONF_XORG_SERVER_OPT_XORGCFG -XORG_SERVER_AUTOCONF += --enable-xorgcfg +ifdef PTXCONF_XORG_SERVER_XFBDEV +XORG_SERVER_AUTOCONF += --enable-xfbdev else -XORG_SERVER_AUTOCONF += --disable-xorgcfg +XORG_SERVER_AUTOCONF += --disable-xfbdev endif -ifdef PTXCONF_XORG_SERVER_OPT_KBD_MODE -XORG_SERVER_AUTOCONF += --enable-kbd_mode +ifdef PTXCONF_XORG_SERVER_OPT_INSTALL_SETUID +XORG_SERVER_AUTOCONF += --enable-install-setuid else -XORG_SERVER_AUTOCONF += --disable-kbd_mode +XORG_SERVER_AUTOCONF += --disable-install-setuid endif -ifdef PTXCONF_MESALIB -XORG_SERVER_AUTOCONF += --with-mesa-source=$(MESALIB_DIR) +ifdef PTXCONF_XORG_SERVER_OPT_SECURE_RPC +XORG_SERVER_AUTOCONF += --enable-secure-rpc +else +XORG_SERVER_AUTOCONF += --disable-secure-rpc endif -# default is on -# Note: A given "--enable-dpms" disables it! -# There is an error in the configure script. -# --enable-dpms and --disable-dpms both are setting the wrong variable -# So its disabled by default. Only if no switch is given, DPMS will be enabled -# Its fixed in the git version, so in the next release it should handle correctly # -ifndef PTXCONF_XORG_SERVER_EXT_DPMS -XORG_SERVER_AUTOCONF += --disable-dpms -#else -#XORG_SERVER_AUTOCONF += --enable-dpms # FIXME workaround! -endif - -ifdef PTXCONF_XORG_SERVER_INT10_VM86 -XORG_SERVER_AUTOCONF += --with-int10=vm86 -endif - -ifdef PTXCONF_XORG_SERVER_INT10_X86EMU -XORG_SERVER_AUTOCONF += --with-int10=x86emu -endif +# FIXME rsc: what's the reason for this hack? +# -ifdef PTXCONF_XORG_SERVER_INT10_VM86 -XORG_SERVER_AUTOCONF += --with-int10=stub +# if no value is given ignore the "--datadir" switch +ifneq ($(call remove_quotes,$(PTXCONF_XORG_DEFAULT_DATA_DIR)),) + XORG_SERVER_AUTOCONF += --datadir=$(PTXCONF_XORG_DEFAULT_DATA_DIR) endif -# FIXME: What does it *really* mean? -#XORG_SERVER_AUTOCONF += --disable-xinput # -# unhandled yet +# FIXME rsc: old options from older xorg-server versions. Still needed/possible? +# +# # -# --with-fontdir=/my/path/to/my/fonts -# Default is: FONTDIR="${libdir}/X11/fonts" +#ifdef PTXCONF_XORG_SERVER_EXT_XF86MISC +#XORG_SERVER_AUTOCONF += --enable-xf86misc +#else +#XORG_SERVER_AUTOCONF += --disable-xf86misc +#endif # -# --with-default-font-path=path1,path2,path3 -# Default is: DEFAULT_FONT_PATH="${FONTDIR}/misc/,${FONTDIR}/TTF/,\ -# ${FONTDIR}/OTF, ${FONTDIR}/Type1/,${FONTDIR}/CID/,${FONTDIR}/100dpi/,\ -# ${FONTDIR}/75dpi/" -# FIXME: should be overwritten for small X-Servers! +#ifdef PTXCONF_XORG_SERVER_EXT_XEVIE +#XORG_SERVER_AUTOCONF += --enable-xevie +#else +#XORG_SERVER_AUTOCONF += --disable-xevie +#endif # -# --with-xkb-path=/path/to/my/mappings -# Default is: XKBPATH="${datadir}/X11/xkb" +#ifdef PTXCONF_XORG_SERVER_EXT_APPGROUP +#XORG_SERVER_AUTOCONF += --enable-appgroup +#else +#XORG_SERVER_AUTOCONF += --disable-appgroup +#endif # -# --with-xkb-output=/path/to/my/compiled/mappings -# Default is: XKBOUTPUT="compiled" (results in $XKBPATH/$XKBOUTPUT) +#ifdef PTXCONF_XORG_SERVER_EXT_CUP +#XORG_SERVER_AUTOCONF += --enable-cup +#else +#XORG_SERVER_AUTOCONF += --disable-cup +#endif # -# --with-rgb-path=/path/to/my/rgb-settings -# Default is: RGBPATH="${datadir}/X11/rgb" +#ifdef PTXCONF_XORG_SERVER_EXT_EVI +#XORG_SERVER_AUTOCONF += --enable-evi +#else +#XORG_SERVER_AUTOCONF += --disable-evi +#endif # +#ifdef PTXCONF_XORG_SERVER_EXT_FONTCACHE +#XORG_SERVER_AUTOCONF += --enable-fontcache +#else +#XORG_SERVER_AUTOCONF += --disable-fontcache +#endif +# +#ifdef PTXCONF_FREETYPE +#XORG_SERVER_AUTOCONF += --enable-freetype +#else +#XORG_SERVER_AUTOCONF += --disable-freetype +#endif +# +#ifdef PTXCONF_XORG_SERVER_OPT_XORGCFG +#XORG_SERVER_AUTOCONF += --enable-xorgcfg +#else +#XORG_SERVER_AUTOCONF += --disable-xorgcfg +#endif +# +#ifdef PTXCONF_XORG_SERVER_OPT_KBD_MODE +#XORG_SERVER_AUTOCONF += --enable-kbd_mode +#else +#XORG_SERVER_AUTOCONF += --disable-kbd_mode +#endif +# +#ifdef PTXCONF_MESALIB +#XORG_SERVER_AUTOCONF += --with-mesa-source=$(MESALIB_DIR) +#endif +# +#ifdef PTXCONF_XORG_SERVER_INT10_VM86 +#XORG_SERVER_AUTOCONF += --with-int10=vm86 +#endif +# +#ifdef PTXCONF_XORG_SERVER_INT10_X86EMU +#XORG_SERVER_AUTOCONF += --with-int10=x86emu +#endif +# +#ifdef PTXCONF_XORG_SERVER_INT10_VM86 +#XORG_SERVER_AUTOCONF += --with-int10=stub +#endif # ---------------------------------------------------------------------------- # Target-Install @@ -536,3 +573,4 @@ xorg-server_clean: rm -rf $(XORG_SERVER_DIR) # vim: syntax=make + |