--- configure.ac.old 2005-09-30 11:47:28.000000000 -0400 +++ configure.ac 2005-09-30 13:31:52.000000000 -0400 @@ -857,8 +857,7 @@ if test "x$XORG" = xyes; then AC_SUBST([LD_EXPORT_SYMBOLS_FLAG]) dnl these only go in xorg-config.h - XF86CONFIGFILE="xorg.conf" - CONFIGFILE="$sysconfdir/$XF86CONFIGFILE" + configdir="$sysconfdir" LOGPREFIX="$logdir/Xorg." AC_DEFINE(XORG_SERVER, 1, [Building Xorg server]) AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) @@ -875,13 +874,14 @@ if test "x$XORG" = xyes; then AC_DEFINE(WITH_VGAHW, 1, [Building vgahw module]) AC_DEFINE(DRIVERS, {}, [Built-in output drivers (none)]) AC_DEFINE(IDRIVERS, {}, [Built-in input drivers (none)]) - AC_DEFINE_DIR(__XCONFIGFILE__, XF86CONFIGFILE, [Name of configuration file]) - AC_DEFINE_DIR(XF86CONFIGFILE, CONFIGFILE, [Path to Xorg configuration file]) + AC_DEFINE(XORG_CONFIGFILE, "xorg.conf", [Name of configuration file]) + AC_DEFINE_DIR(DEFAULT_CONFIGPATH, configdir, [Path to Xorg configuration file]) AC_DEFINE_DIR(DEFAULT_MODULE_PATH, moduledir, [Default module search path]) AC_DEFINE_DIR(DEFAULT_LOGPREFIX, LOGPREFIX, [Default log location]) AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support]) driverdir="$moduledir/drivers" + AC_SUBST([configdir]) AC_SUBST([moduledir]) AC_SUBST([driverdir]) sdkdir="$includedir/xorg"