[xorg-commit-diffs] xc/config/cf sun.cf, 1.1.4.12, 1.1.4.13 sunLib.tmpl, 1.1.4.4, 1.1.4.5

[Alan Coopersmith]

Committed by: alanc

Update of /cvs/xorg/xc/config/cf
In directory pdx:/tmp/cvs-serv28538/config/cf

Modified Files:
      Tag: XORG-CURRENT
	sun.cf sunLib.tmpl 
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: sun.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/sun.cf,v
retrieving revision 1.1.4.12
retrieving revision 1.1.4.13
diff -u -d -r1.1.4.12 -r1.1.4.13
--- a/sun.cf	17 Apr 2004 18:47:05 -0000	1.1.4.12
+++ b/sun.cf	18 Apr 2004 03:00:42 -0000	1.1.4.13
@@ -209,30 +209,38 @@
 #define XkbServerDefines  -DXKB_ALWAYS_USES_SOFT_REPEAT
 
 #if OSMajorVersion > 4
-#define ConnectionFlags		-DTCPCONN -DUNIXCONN -DLOCALCONN
-#if HasSunC
-/* 
- * Assume /opt/SUNWspro/bin/ contains symlinks to the appropriate tools
- */
-#ifndef  CcCmd
-# define CcCmd			/opt/SUNWspro/bin/cc
-#endif
-#ifndef  CplusplusCmd
-# define CplusplusCmd		/opt/SUNWspro/bin/CC
-#endif
-#ifndef  CplusplusFilt
-#  define CplusplusFilt		/opt/SUNWspro/bin/c++filt
-#endif
-#ifndef  CplusplusDependIncludes
-#if CplusplusCompilerMajorVersion > 3
-# define CplusplusDependIncludes	-I/opt/SUNWspro/SC4.0/include/CC
-#elif CplusplusCompilerMajorVersion > 2
-# define CplusplusDependIncludes	-I/opt/SUNWspro/SC3.0/include/CC
-#else
-# define CplusplusDependIncludes	-I/opt/SUNWspro/SC2.0.1/include/CC
-#endif
-#endif
-#endif
+# define ConnectionFlags		-DTCPCONN -DUNIXCONN -DLOCALCONN
+# if HasSunC
+#  ifdef DefaultSunProCCompilerDir
+#   ifndef  CcCmd
+#    define CcCmd		DefaultSunProCCompilerDir/cc
+#   endif
+#  endif
+#  ifdef DefaultSunProCplusplusCompilerDir
+#   ifndef  CplusplusCmd
+#    define CplusplusCmd	DefaultSunProCplusplusCompilerDir/CC
+#   endif
+#   ifndef  CplusplusFilt
+#    define CplusplusFilt	DefaultSunProCplusplusCompilerDir/c++filt
+#   endif
+#   ifndef  CplusplusWhatdir
+#    define CplusplusWhatdir	DefaultSunProCplusplusCompilerDir/whatdir
+#   endif
+#  else /* DefaultSunProCplusplusCompilerDir not defined */
+#   ifndef  CplusplusWhatdir
+#    define CplusplusWhatdir	whatdir
+#   endif
+#  endif /* DefaultSunProCplusplusCompilerDir */
+#  ifndef  CplusplusDependIncludes
+#   if CplusplusCompilerMajorVersion > 3
+#    define CplusplusDependIncludes	-I`CplusplusWhatdir CC`/../include/CC
+#   elif CplusplusCompilerMajorVersion > 2
+#    define CplusplusDependIncludes	-I/opt/SUNWspro/SC3.0/include/CC
+#   else
+#    define CplusplusDependIncludes	-I/opt/SUNWspro/SC2.0.1/include/CC
+#   endif
+#  endif 
+# endif /* HasSunC */
 
 # if HasSunC && (CCompilerMajorVersion < 3)
 #  define BootstrapCFlags	-DSVR4

Index: sunLib.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/sunLib.tmpl,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/sunLib.tmpl	15 Apr 2004 10:13:10 -0000	1.1.4.4
+++ b/sunLib.tmpl	18 Apr 2004 03:00:42 -0000	1.1.4.5
@@ -87,7 +87,11 @@
 UNSHARED_CXXLIB = -static -lC
 #  elif HasSunCplusplus
 #   if CplusplusCompilerMajorVersion > 3
+#    ifdef CplusplusWhatdir
+UNSHARED_CXXLIB = -Bstatic -L`CplusplusWhatdir CC`/../lib -lC -Bdynamic
+#    else
 UNSHARED_CXXLIB = -Bstatic -L/opt/SUNWspro/SC4.0/lib -lC -Bdynamic
+#    endif
 #   else
 UNSHARED_CXXLIB = -Bstatic -lC -Bdynamic -lm -lc -Bstatic
 #   endif