[xorg-commit-diffs] xc/programs/Xserver/GL/mesa/src/X Imakefile, 1.1.10.1, 1.1.10.1.6.1

[Roland Mainz]

Committed by: gisburn

Update of /cvs/xorg/xc/programs/Xserver/GL/mesa/src/X
In directory pdx:/tmp/cvs-serv7662/xc/programs/Xserver/GL/mesa/src/X

Modified Files:
      Tag: XPRINT
	Imakefile 
Log Message:
Resync to 2004-04-10 XORG-RELEASE-1 branch

Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/GL/mesa/src/X/Imakefile,v
retrieving revision 1.1.10.1
retrieving revision 1.1.10.1.6.1
diff -u -d -r1.1.10.1 -r1.1.10.1.6.1
--- a/Imakefile	4 Mar 2004 17:47:19 -0000	1.1.10.1
+++ b/Imakefile	10 Apr 2004 09:04:13 -0000	1.1.10.1.6.1
@@ -27,7 +27,7 @@
   DRIVER_SRCS = $(XMESA_SRCS)
   DRIVER_OBJS = $(XMESA_OBJS)
 
-#ifndef XFree86Version
+#if (!defined (XFree86Version) && !defined(XorgVersion))
 
 /* This appears to be the quickest way to build a non-XFree86 server */
 GLXSRV_DEFINES = -DXFree86Server