summaryrefslogtreecommitdiff
path: root/hw/xfree86/utils/xorgcfg/config.h
diff options
context:
space:
mode:
authorAlan Coopersmith <Alan.Coopersmith@sun.com>2005-09-26 02:41:38 +0000
committerAlan Coopersmith <Alan.Coopersmith@sun.com>2005-09-26 02:41:38 +0000
commit0531c4be2f1a30082cfec5e411ab34d17978d66e (patch)
tree3a81ab7efd7187db2800467ebe7b6275de64419e /hw/xfree86/utils/xorgcfg/config.h
parent256fa24945bcaa6e5a68a48c1b757f8084e88a38 (diff)
alanc@alf:/export/alanc/X.org/head/cvs-rw/xc [7:40pm - 628] head -14
ChangeLog include xorg-config.h for modular build Adjust XF86CONFIG defines for modular build Fixes for modular build: - include modular server config headers - change default XCONFIGFILE to xorg.conf - define XKB_RULES_DIR if not defined by Imake
Diffstat (limited to 'hw/xfree86/utils/xorgcfg/config.h')
-rw-r--r--hw/xfree86/utils/xorgcfg/config.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/xfree86/utils/xorgcfg/config.h b/hw/xfree86/utils/xorgcfg/config.h
index 6c5b437d1..6cbdc5e30 100644
--- a/hw/xfree86/utils/xorgcfg/config.h
+++ b/hw/xfree86/utils/xorgcfg/config.h
@@ -29,6 +29,10 @@
* $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.h,v 1.21 2004/02/13 23:58:52 dawes Exp $
*/
+#ifdef HAVE_CONFIG_H
+# include "xorg-config.h"
+#endif
+
#include <X11/IntrinsicP.h>
#include <X11/StringDefs.h>
#include <X11/Xmu/SysUtil.h>