[xorg-commit-diffs] xc/programs/xrx/libxplugin Imakefile, 1.1.4.3, 1.1.4.4

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/xrx/libxplugin
In directory pdx:/home/eich/tstbuild/xc/programs/xrx/libxplugin

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/xrx/libxplugin/Imakefile,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/Imakefile	5 Mar 2004 13:41:38 -0000	1.1.4.3
+++ b/Imakefile	15 Apr 2004 10:17:50 -0000	1.1.4.4
@@ -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