Module Name: xsrc
Committed By: mrg
Date: Sun Nov 8 11:39:23 UTC 2009
Modified Files:
xsrc/external/mit/xorg-cf-files/dist: Imake.cf NetBSD.cf X11.tmpl
Log Message:
merge xorg-cf-files 1.0.3
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-cf-files/dist/Imake.cf \
xsrc/external/mit/xorg-cf-files/dist/X11.tmpl
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-cf-files/dist/Imake.cf
diff -u xsrc/external/mit/xorg-cf-files/dist/Imake.cf:1.2 xsrc/external/mit/xorg-cf-files/dist/Imake.cf:1.3
--- xsrc/external/mit/xorg-cf-files/dist/Imake.cf:1.2 Wed Sep 17 03:56:52 2008
+++ xsrc/external/mit/xorg-cf-files/dist/Imake.cf Sun Nov 8 11:39:23 2009
@@ -1,4 +1,4 @@
-XCOMM $XdotOrg: util/cf/Imake.cf,v 1.12 2005/11/08 06:33:24 jkj Exp $
+XCOMM $XdotOrg: xc/config/cf/Imake.cf,v 1.7 2005/03/02 11:20:29 gisburn Exp $
XCOMM $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $
/*
* To add support for another platform:
@@ -792,6 +792,9 @@
# ifdef __linux__
# define LinuxArchitecture
# endif
+# ifdef __GLIBC__
+# define GNUArchitecture
+# endif
# ifdef i386
# ifndef i386Architecture
# define i386Architecture
Index: xsrc/external/mit/xorg-cf-files/dist/X11.tmpl
diff -u xsrc/external/mit/xorg-cf-files/dist/X11.tmpl:1.2 xsrc/external/mit/xorg-cf-files/dist/X11.tmpl:1.3
--- xsrc/external/mit/xorg-cf-files/dist/X11.tmpl:1.2 Wed May 13 21:27:48 2009
+++ xsrc/external/mit/xorg-cf-files/dist/X11.tmpl Sun Nov 8 11:39:23 2009
@@ -1,6 +1,6 @@
XCOMM ----------------------------------------------------------------------
XCOMM X Window System Build Parameters and Rules
-XCOMM $XdotOrg: util/cf/X11.tmpl,v 1.54 2006/04/15 15:55:25 herrb Exp $
+XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.52 2005/09/22 23:54:18 alanc Exp $
XCOMM $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $
XCOMM
XCOMM
@@ -3394,7 +3394,7 @@
#if HasMotif
#ifndef MotifDir
-#define MotifDir /usr/X11R6
+#define MotifDir ProjectRoot
#endif
#ifndef MotifDirStandard
#define MotifDirStandard NO
Index: xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf
diff -u xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf:1.3 xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf:1.4
--- xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf:1.3 Fri Mar 6 19:46:58 2009
+++ xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf Sun Nov 8 11:39:23 2009
@@ -407,7 +407,7 @@
#endif /* i386Architecture */
#if defined(AMD64Architecture)
-# define HasMTRRBuiltin YES
+# define HasMTRRBuiltin YES
#endif
/*
@@ -596,7 +596,9 @@
# define BuildXInputLib YES
#endif
-#if !defined(SparcArchitecture)
+
+/* was !defined(SparcArchitecture) */
+#if defined(i386Architecture) || defined(Arm32Architecture) || defined(AlphaArchitecture) || defined(PpcArchitecture) || defined(AMD64Architecture)
# include <xorg.cf>
#endif
