Stop searching for XF86Config files
xorg.conf has been used since the X11R6.7 release in April 2004. 6 years has been a generous transition period for users to "mv XF86Config xorg.conf" and for distros to update their configuration tools and packages. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: James Cloos <cloos@jhcloos.com> Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
01c75522b6
commit
d163266692
|
@ -626,7 +626,6 @@ xf86pathIsSafe(const char *path)
|
||||||
#ifndef XCONFENV
|
#ifndef XCONFENV
|
||||||
#define XCONFENV "XORGCONFIG"
|
#define XCONFENV "XORGCONFIG"
|
||||||
#endif
|
#endif
|
||||||
#define XFREE86CFGFILE "XF86Config"
|
|
||||||
/* xorg.conf is based on XF86Config version 4. If we ever break
|
/* xorg.conf is based on XF86Config version 4. If we ever break
|
||||||
compatibility of the xorg.conf syntax, we'll bump this version number. */
|
compatibility of the xorg.conf syntax, we'll bump this version number. */
|
||||||
#ifndef CONFIG_FILE_VERSION
|
#ifndef CONFIG_FILE_VERSION
|
||||||
|
@ -988,11 +987,8 @@ xf86openConfigFile(const char *path, const char *cmdline, const char *projroot)
|
||||||
if (!projroot || !projroot[0])
|
if (!projroot || !projroot[0])
|
||||||
projroot = PROJECTROOT;
|
projroot = PROJECTROOT;
|
||||||
|
|
||||||
/* Search for a config file or a fallback */
|
/* Search for a config file */
|
||||||
configPath = OpenConfigFile(path, cmdline, projroot, XCONFIGFILE);
|
configPath = OpenConfigFile(path, cmdline, projroot, XCONFIGFILE);
|
||||||
if (!configPath)
|
|
||||||
configPath = OpenConfigFile(path, cmdline, projroot,
|
|
||||||
XFREE86CFGFILE);
|
|
||||||
return configPath;
|
return configPath;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user