[Xorg-commit] xc/lib/GL/mesa/src/OSmesa Imakefile,1.1.4.1,1.1.4.2

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/lib/GL/mesa/src/OSmesa
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/lib/GL/mesa/src/OSmesa

Modified Files:
      Tag: XORG-CURRENT
	Imakefile 
Log Message:
merge XFree86 RC2 (4.3.99.902) from vendor branch

Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/OSmesa/Imakefile,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- Imakefile	26 Nov 2003 22:48:31 -0000	1.1.4.1
+++ Imakefile	20 Dec 2003 00:28:21 -0000	1.1.4.2
@@ -1,4 +1,5 @@
-XCOMM $XFree86: xc/lib/GL/mesa/src/OSmesa/Imakefile,v 1.19 2003/11/04 00:24:35 torrey Exp $
+XCOMM $XdotOrg$
+XCOMM $XFree86: xc/lib/GL/mesa/src/OSmesa/Imakefile,v 1.20 2003/12/12 03:20:33 dawes Exp $
 
 #include <Threads.tmpl>
 
@@ -15,7 +16,7 @@
 #include "../tnl/Imakefile.inc"
 #include "../tnl_dd/Imakefile.inc"
 #include "../Imakefile.inc"
-#if defined(i386Architecture) && !SystemV4 && MesaUseX86Asm
+#if defined(i386Architecture) && MesaUseX86Asm
 #include "../X86/Imakefile.inc"
 #endif
 #ifdef SparcArchitecture