[xorg-commit-diffs] xc/lib/GL/glx Imakefile,1.1.4.2,1.1.4.3

[Alan Coopersmith]

Committed by: alanc

Update of /cvs/xorg/xc/lib/GL/glx
In directory pdx:/tmp/cvs-serv28538/lib/GL/glx

Modified Files:
      Tag: XORG-CURRENT
	Imakefile 
Log Message:
	* xc/lib/GL/glx/Imakefile
	* xc/lib/GL/mesa/src/Imakefile
	LargePICTable required for Solaris SPARC builds

	* xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_accel.c
	* xc/programs/Xserver/hw/xfree86/common/xf86Events.c
	Add != NULL to if statements to get past syntax error reported
	by Sun Forte 6.1 cc.

	* xc/config/imake/imake.c
	* xc/config/cf/sun.cf
	* xc/config/cf/sunLib.tmpl
	Allow compiling with Sun compilers installed somewhere other than
	/opt/SUNWspro

	* xc/programs/Xserver/hw/xfree86/common/compiler.h
	* xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h
	Check for defined(sparc) as well as defined(__sparc__) since Sun
	compilers don't define __sparc__



Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/glx/Imakefile,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/Imakefile	5 Mar 2004 13:38:55 -0000	1.1.4.2
+++ b/Imakefile	18 Apr 2004 03:00:42 -0000	1.1.4.3
@@ -16,6 +16,8 @@
 XCOMM Those portions of the Subject Software created by Silicon Graphics, Inc.
 XCOMM are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
 
+XCOMM $XdotOrg$
+
 #include <Threads.tmpl>
 
 #define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
@@ -24,6 +26,11 @@
 #define DoDebugLib DebugLibGlx
 #define DoProfileLib ProfileLibGlx
 
+/* Large PIC tables needed for Solaris SPARC builds */
+#if (defined(SunArchitecture) && defined(SparcArchitecture))
+# define LargePICTable YES
+#endif
+
 XCOMM #define IHaveSubdirs
 XCOMM #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
 XCOMM