[xorg-commit-diffs] xc/programs/Xserver/Xext Imakefile, 1.1.4.4.2.2, 1.1.4.4.2.2.6.1

[Roland Mainz]

Committed by: gisburn

Update of /cvs/xorg/xc/programs/Xserver/Xext
In directory pdx:/tmp/cvs-serv7662/xc/programs/Xserver/Xext

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/Xext/Imakefile,v
retrieving revision 1.1.4.4.2.2
retrieving revision 1.1.4.4.2.2.6.1
diff -u -d -r1.1.4.4.2.2 -r1.1.4.4.2.2.6.1
--- a/Imakefile	4 Mar 2004 17:47:20 -0000	1.1.4.4.2.2
+++ b/Imakefile	10 Apr 2004 09:04:17 -0000	1.1.4.4.2.2.6.1
@@ -37,12 +37,12 @@
   SCRNSAVOBJ = saver.o
 #endif
 
-#if BuildXF86VidModeExt && XF86Server
+#if BuildXF86VidModeExt && (XF86Server || XorgServer)
  VIDMODESRCS = xf86vmode.c
  VIDMODEOBJS = xf86vmode.o
 #endif
 
-#if BuildXF86MiscExt && XF86Server
+#if BuildXF86MiscExt && (XF86Server || XorgServer)
 XF86MISCSRCS = xf86misc.c
 XF86MISCOBJS = xf86misc.o
 #endif
@@ -121,7 +121,7 @@
 	      xtest.o xtest1di.o xtest1dd.o sleepuntil.o $(PNRXOBJS) \
 	      $(XF86BIGFOBJS)
 
-#ifdef XFree86Version
+#if (defined(XFree86Version) || defined(XorgVersion))
 /* XXX Check if this can be eliminated */
 XF86INCLUDES = -I$(XF86COMSRC)
 #endif