frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check for getconfig in GETCONFIG_DIR if it's not found in module dir.

This commit is contained in:
Alan Coopersmith 2005-08-23 20:12:26 +00:00
parent bfd1364586
commit cff4b1c216
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/xfree86/common/xf86AutoConfig.c
View File

@ -1,4 +1,5 @@
/* $DHD: xc/programs/Xserver/hw/xfree86/common/xf86AutoConfig.c,v 1.15 2003/09/24 19:39:36 dawes Exp $ */ /* $DHD: xc/programs/Xserver/hw/xfree86/common/xf86AutoConfig.c,v 1.15 2003/09/24 19:39:36 dawes Exp $ */
/* $XdotOrg: $ */
/* /*
* Copyright 2003 by David H. Dawes. * Copyright 2003 by David H. Dawes.
@ -201,8 +202,9 @@ xf86AutoConfig(void)
/* /*
* Look for the getconfig program first in the xf86ModulePath * Look for the getconfig program first in the xf86ModulePath
* directories, then in BINDIR. If it isn't found in any of those * directories, then in GETCONFIG_DIR, then in BINDIR. If it
* locations, just use the normal search path. * isn't found in any of those locations, just use the normal
* search path.
*/ */
if (xf86ModulePath) { if (xf86ModulePath) {
@ -223,6 +225,14 @@ xf86AutoConfig(void)
xfree(a); xfree(a);
} }
if (!path) {
path = xnfstrdup(GETCONFIG_DIR "/" GET_CONFIG_CMD);
if (access(path, X_OK) != 0) {
xfree(path);
path = NULL;
}
}
#ifdef BINDIR #ifdef BINDIR
if (!path) { if (!path) {
path = xnfstrdup(BINDIR "/" GET_CONFIG_CMD); path = xnfstrdup(BINDIR "/" GET_CONFIG_CMD);