Xorg server builds from modular tree on Solaris x86

[Alan Coopersmith]

Solaris 10 x86, 32-bit, using Sun Studio Compilers version 10:

% ls -l xorg/hw/xfree86/Xorg
-rwxr-xr-x   1 alanc    staff    3065556 Jul 13 19:55 xorg/hw/xfree86/Xorg*

(Just built, haven't tried running yet - that's a project for tomorrow.)

There are changes to two files I had to make that I haven't committed yet, since
they probably need to be considered by people working on other platforms so I
don't break them:

Since Sun cc doesn't support -include, I had to fake it in dixmods
for miinitext.c to define all the right symbols, and for xkb*.c to
build without missing type defintion errors:

diff -u -r1.8 Makefile.am
--- xorg/hw/xfree86/dixmods/Makefile.am 14 Jul 2005 02:53:30 -0000      1.8
+++ xorg/hw/xfree86/dixmods/Makefile.am 14 Jul 2005 03:00:02 -0000
@@ -73,10 +73,15 @@
         xkbKillSrv.c \
         xkbPrivate.c \
         xkbVT.c \
-       $(top_srcdir)/mi/miinitext.c
+       miinitext.c
+
+miinitext.c:
+       echo "#include \"xorg-config.h\"" >> $@
+       echo "#include \"$(top_srcdir)/mi/miinitext.c\"" >> $@

  xkb%.c:
         echo "#define XF86DDXACTIONS" > $@
+       echo "#include \"xorg-config.h\"" >> $@
         echo "#include \"$(top_srcdir)/xkb/ddx$*.c\"" >> $@

  DISTCLEANFILES = xkbKillSrv.c xkbPrivate.c xkbVT.c


Since Solaris doesn't have DRI support yet, I made the dri directory only
built when --enable-dri is active.   I also had to remove the gcc-only
-rdynamic flag from the link of Xorg.   IRC discussion wasn't sure why
it's even there:

diff -u -r1.5 Makefile.am
--- xorg/hw/xfree86/Makefile.am 14 Jul 2005 00:28:47 -0000      1.5
+++ xorg/hw/xfree86/Makefile.am 14 Jul 2005 03:00:02 -0000
@@ -1,6 +1,10 @@
+if DRI
+DRIDIR=dri
+endif
+
  SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser rac \
            ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp \
-         xf8_32wid loader scanpci dixmods dri
+         xf8_32wid loader scanpci dixmods $(DRIDIR)

  bin_PROGRAMS = Xorg

@@ -29,4 +33,4 @@
               @XSERVER_LIBS@ \
               -ldl

-Xorg_LDFLAGS = -rdynamic
+#Xorg_LDFLAGS = -rdynamic


-- 
	-Alan Coopersmith-           alan.coopersmith at sun.com
	 Sun Microsystems, Inc. - X Window System Engineering