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

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/Xserver/GL/mesa/src/X
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/GL/mesa/src/X

Modified Files:
      Tag: XORG-CURRENT
	Imakefile 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/GL/mesa/src/X/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
--- a/Imakefile	5 Mar 2004 13:39:49 -0000	1.1.4.1
+++ b/Imakefile	15 Apr 2004 10:15:14 -0000	1.1.4.2
@@ -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