XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 14:34:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
10eec2ccb11701fe29ab246acd6c0bdc2991b775
xserver/include
History
Aaron Plattner f5ded22e14 meson: Set XCONFIGFILE to 'xorg.conf' instead of '/etc/xorg.conf' 
The autoconf build hard-codes XCONFIGFILE to just 'xorg.conf':

 XF86CONFIGFILE="xorg.conf"
 AC_DEFINE_DIR(XCONFIGFILE, XF86CONFIGFILE, [Name of configuration file])

Later, the X server passes that into DoSubstitution() which expands the path:

 DoSubstitution(template="/etc/X11/%X", ..., XConfigFile="xorg.conf")

This returns "/etc/X11/xorg.conf".

The Meson build, on the other hand, sets XCONFIGFILE to
join_paths(get_option('sysconfdir'), 'xorg.conf'). If sysconfdir is /etc, this
results in '/etc/xorg.conf', resulting in DoSubstitution returning
'/etc/X11/etc/xorg.conf'.

Fix this by just hard-coding XCONFIGFILE to 'xorg.conf'.

Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
2018-05-07 12:25:00 -04:00
..
.gitignore
.gitignore: use common defaults with custom section #24239
2009-11-11 21:40:20 -08:00
busfault.h
Trap SIGBUS to handle truncated shared memory segments
2013-11-11 15:16:07 -08:00
callback.h
Avoid starting a comment with */*
2014-07-17 10:19:52 -07:00
client.h
Introduce a consistent coding style
2012-03-21 13:54:42 -07:00
closestr.h
Replace 'pointer' type with 'void *'
2014-01-12 10:24:11 -08:00
closure.h
Drop trailing whitespaces
2014-11-12 10:25:00 +10:00
colormap.h
dix: Unexport various implementation details
2015-07-08 16:40:57 -04:00
colormapst.h
Drop trailing whitespaces
2014-11-12 10:25:00 +10:00
cursor.h
Drop trailing whitespaces
2014-11-12 10:25:00 +10:00
cursorstr.h
cursor: drop ARGB_CURSOR
2015-06-30 12:17:51 +10:00
dbus-core.h
xfree86: drop double-typedef of DBusConnection
2014-11-12 10:25:00 +10:00
displaymode.h
vidmode: move display mode definitions
2016-02-29 16:28:57 -05:00
dix-config-apple-verbatim.h
…
dix-config.h.in
dix: Remove unused definitions from dix-config.h.in
2018-03-28 09:54:18 -04:00
dix.h
dix: Remove ffs.c
2017-11-06 17:22:46 -05:00
dixaccess.h
Introduce a consistent coding style
2012-03-21 13:54:42 -07:00
dixevents.h
dix: Remove redundant declarations.
2012-05-14 13:31:00 +01:00
dixfont.h
dix: Switch to the libXfont2 API (v2)
2016-07-18 15:25:59 -04:00
dixfontstr.h
dix: Switch to the libXfont2 API (v2)
2016-07-18 15:25:59 -04:00
dixgrabs.h
Avoid starting a comment with */*
2014-07-17 10:19:52 -07:00
dixstruct.h
os: Define {ReadFdFrom,WriteFdTo}Client unconditionally
2018-03-08 14:12:36 -05:00
eventconvert.h
input: drop FP1616 macro
2012-11-19 12:12:23 +10:00
events.h
dga: #if XFreeXDGA → #ifdef XFreeXDGA
2018-02-19 13:14:43 -05:00
eventstr.h
dga: #if XFreeXDGA → #ifdef XFreeXDGA
2018-02-19 13:14:43 -05:00
exevents.h
dix: Move DeviceFocusEvent from Xi into enterleave.c
2012-05-17 08:50:44 +10:00
extension.h
Drop trailing whitespaces
2014-11-12 10:25:00 +10:00
extinit.h
miinitext: Load GLX on the mi path
2018-02-14 17:04:48 -05:00
extnsionst.h
dix: Remove extension aliases
2017-06-20 16:37:24 -04:00
gc.h
Drop trailing whitespaces
2014-11-12 10:25:00 +10:00
gcstruct.h
fb: Remove 24bpp support (v3)
2017-03-17 15:14:42 -04:00
globals.h
miinitext: General cleanup (v2)
2018-01-22 17:28:12 -05:00
glx_extinit.h
miinitext: Load GLX on the mi path
2018-02-14 17:04:48 -05:00
glxvndabi.h
glx: Import glxvnd server module (v2)
2018-02-14 17:04:35 -05:00
hotplug.h
config: Replace OdevAttributes linked list with struct
2014-07-17 17:10:48 -07:00
input.h
os: log a bug whenever WriteToClient is called from the input thread
2017-02-27 09:25:08 +10:00
inputstr.h
miinitext: General cleanup (v2)
2018-01-22 17:28:12 -05:00
inpututils.h
Input: Add DeviceEventSource enum
2015-11-24 11:36:32 +10:00
list.h
Correct xorg_list_is_empty return value description
2018-02-12 08:09:53 +10:00
Makefile.am
meson: Generate xorg-server.h
2018-03-28 09:54:22 -04:00
meson.build
meson: Set XCONFIGFILE to 'xorg.conf' instead of '/etc/xorg.conf'
2018-05-07 12:25:00 -04:00
misc.h
modesetting: Fix potential buffer overflow
2017-10-30 13:44:34 -04:00
miscstruct.h
Drop trailing whitespaces
2014-11-12 10:25:00 +10:00
nonsdk_extinit.h
Make PseudoramiXExtensionInit() prototype more generally available
2015-03-16 16:56:17 +00:00
opaque.h
configurable maximum number of clients
2015-08-24 00:00:18 -07:00
optionstr.h
Introduce a consistent coding style
2012-03-21 13:54:42 -07:00
os.h
os: move xf86PrivsElevated here
2018-03-21 10:58:39 -04:00
pixmap.h
Make PixmapDirtyUpdateRec::src a DrawablePtr
2017-08-15 17:01:39 +09:00
pixmapstr.h
Make PixmapDirtyUpdateRec::src a DrawablePtr
2017-08-15 17:01:39 +09:00
privates.h
dix: Remove PRIVATE_DAMAGE
2017-03-21 11:20:26 -04:00
probes.h
Get rid of const warnings in XSERVER_INPUT_EVENT dtrace probe calls
2015-02-10 18:14:44 -08:00
property.h
dix: Add a callback chain for window property state change
2017-02-23 13:30:11 -05:00
propertyst.h
Drop trailing whitespaces
2014-11-12 10:25:00 +10:00
protocol-versions.h
present: Advertise protocol version 1.2
2018-03-19 15:44:46 -04:00
ptrveloc.h
dix: indentation fixes for pointer acceleration
2012-05-16 10:59:35 +10:00
region.h
Drop trailing whitespaces
2014-11-12 10:25:00 +10:00
regionstr.h
dix: make RegionInit legal C++
2015-01-23 10:35:49 -08:00
registry.h
XSERVER_DTRACE needs request names from registry too
2014-09-22 12:00:46 -07:00
resource.h
dix: export ResourceClientBits()
2015-09-01 20:11:26 -07:00
rgb.h
Drop trailing whitespaces
2014-11-12 10:25:00 +10:00
screenint.h
Drop trailing whitespaces
2014-11-12 10:25:00 +10:00
scrnintstr.h
Make PixmapDirtyUpdateRec::src a DrawablePtr
2017-08-15 17:01:39 +09:00
selection.h
Drop trailing whitespaces
2014-11-12 10:25:00 +10:00
servermd.h
dix: Fix image byte order on big endian hardware
2015-05-07 14:03:50 -04:00
site.h
Drop trailing whitespaces
2014-11-12 10:25:00 +10:00
swaprep.h
dix: Unexport various implementation details
2015-07-08 16:40:57 -04:00
swapreq.h
dix: Unexport various implementation details
2015-07-08 16:40:57 -04:00
systemd-logind.h
systemd-logind: let the logind code decided whether to close an fd
2014-05-05 07:26:33 +10:00
validate.h
Introduce a consistent coding style
2012-03-21 13:54:42 -07:00
version-config.h.in
Move VENDOR_* defines from AC_SUBST to a header to avoid angering shave.
2009-04-14 10:35:44 -04:00
vidmodestr.h
vidmode: build without xf86vidmodeproto
2016-03-01 11:25:59 -05:00
window.h
dix: Add hybrid full-size/empty-clip mode to SetRootClip
2016-02-22 13:26:31 -05:00
windowstr.h
dix: unifdef pWin->rootlessUnhittable
2015-07-08 16:41:28 -04:00
XIstubs.h
Introduce a consistent coding style
2012-03-21 13:54:42 -07:00
xkb-config.h.in
Move to autoconf standard function name checks & defines
2011-12-05 14:32:45 -08:00
xkbfile.h
Drop trailing whitespaces
2014-11-12 10:25:00 +10:00
xkbrules.h
xkb: add a call to init an XkbRMLVOSet from const chars
2014-02-04 10:53:59 +10:00
xkbsrv.h
dix: Don't track the XKB client versions in the ClientRec
2017-10-24 15:53:28 -04:00
xkbstr.h
Drop trailing whitespaces
2014-11-12 10:25:00 +10:00
xorg-config.h.in
xfree86: Silence a new glibc warning
2017-05-03 15:44:06 -04:00
xorg-config.h.meson.in
Add a Meson build system alongside autotools.
2017-04-26 15:25:27 -07:00
xorg-server.h.in
xorg: Remove unused definitions from xorg-server.h.in
2018-03-28 09:54:17 -04:00
xorg-server.h.meson.in
meson: Generate xorg-server.h
2018-03-28 09:54:22 -04:00
Xprintf.h
os/xprintf: add Xvscnprintf and Xscnprintf
2012-05-03 14:59:23 +10:00
xserver_poll.h
Use #ifdef instead of #if for features to make Meson easier.
2017-04-26 17:30:12 -04:00
xserver-properties.h
Add missing labels for multitouch valuators
2012-10-30 15:11:10 +10:00
xsha1.h
Drop trailing whitespaces
2014-11-12 10:25:00 +10:00
xwayland-config.h.in
xwayland: Add glamor egl_backend for EGLStreams
2018-04-24 16:51:18 -04:00
xwayland-config.h.meson.in
xwayland: Add glamor egl_backend for EGLStreams
2018-04-24 16:51:18 -04:00
xwin-config.h.in
configure: Restore DEFAULT_LOGDIR to xwin-config.h, it is used
2014-06-02 13:07:46 +01:00
xwin-config.h.meson.in
Add meson.build for XWin server (v2)
2017-06-02 09:32:35 -07:00