[xorg-commit-diffs] xc/programs/xrx/libxplugin Imakefile, 1.1.4.2.6.1, 1.1.4.2.6.1.6.1

[Roland Mainz]

Committed by: gisburn

Update of /cvs/xorg/xc/programs/xrx/libxplugin
In directory pdx:/tmp/cvs-serv7662/xc/programs/xrx/libxplugin

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

Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/xrx/libxplugin/Imakefile,v
retrieving revision 1.1.4.2.6.1
retrieving revision 1.1.4.2.6.1.6.1
diff -u -d -r1.1.4.2.6.1 -r1.1.4.2.6.1.6.1
--- a/Imakefile	4 Mar 2004 17:49:17 -0000	1.1.4.2.6.1
+++ b/Imakefile	10 Apr 2004 09:05:53 -0000	1.1.4.2.6.1.6.1
@@ -6,7 +6,7 @@
 
 #if defined(SGIArchitecture) && (OSMajorVersion > 5)
 
-#ifndef XFree86Version
+#if (!defined(XFree86Version) && !defined(XorgVersion))
 /* Even though we want to build the distribution with -n32, Navigator 3.0
  * binaries are still built on IRIX 5.2, which means we need to use the
  * old style object format. This is a hack because this Imakefile gets