xserver: Branch 'master'

[Keith Packard]

 configure.ac |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 5a8b886a956773669ceb2a2bcacd59184bcc7c99
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Jun 11 15:10:04 2018 -0400

    configure: Remove unused CONFIGFILE
    
    This isn't used for anything, which is just as well, because
    /etc/xorg.conf is not in fact a path xserver will try to use.
    
    Bugzilla: https://bugs.freedesktop.org/8890
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Aaron Plattner <aplattner at nvidia.com>

diff --git a/configure.ac b/configure.ac
index 0075b6ace..7d5cb0d4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2019,7 +2019,6 @@ if test "x$XORG" = xyes; then
 	XF86CONFIGFILE="xorg.conf"
 	XF86CONFIGDIR="xorg.conf.d"
 	AC_SUBST(XF86CONFIGDIR)
-	CONFIGFILE="$sysconfdir/$XF86CONFIGFILE"
 	LOGPREFIX="Xorg."
 	XDG_DATA_HOME=".local/share"
 	XDG_DATA_HOME_LOGDIR="xorg"