# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.

# Use subject to license terms.

#

# Permission is hereby granted, free of charge, to any person obtaining a

# copy of this software and associated documentation files (the

# "Software"), to deal in the Software without restriction, including

# without limitation the rights to use, copy, modify, merge, publish,

# distribute, and/or sell copies of the Software, and to permit persons

# to whom the Software is furnished to do so, provided that the above

# copyright notice(s) and this permission notice appear in all copies of

# the Software and that both the above copyright notice(s) and this

# permission notice appear in supporting documentation.

# 

# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

# 

# Except as contained in this notice, the name of a copyright holder

# shall not be used in advertising or otherwise to promote the sale, use

# or other dealings in this Software without prior written authorization

# of the copyright holder.

diff -urp -x '*~' -x '*.orig' configure.ac configure.ac

+# SolarisIA extension

+IA_LIB='$(top_builddir)/IA/libIA.la'

+

 AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes)

 AC_DEFINE(SHAPE, 1, [Support SHAPE extension])

 AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes])

 if test "x$XVFB" = xyes; then

 	AC_SUBST([XVFB_LIBS])

 AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes])

 if test "x$XNEST" = xyes; then

 	AC_SUBST([XNEST_LIBS])

-    KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB"

+    KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $IA_LIB $OS_LIB"

     KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a'

     case $host_os in

 	*linux*)

 hw/xprint/config/en_US/Makefile

 xorg-server.pc

 ])

+

+# Add Sun IA extension

+AC_OUTPUT([IA/Makefile])

diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c

diff -urp -x '*~' -x '*.orig' hw/xfree86/dixmods/Makefile.am hw/xfree86/dixmods/Makefile.am

 libxtrap_la_LDFLAGS = -avoid-version

 libxtrap_la_LIBADD = $(top_builddir)/XTrap/libxtrap.la

 libxtrap_la_SOURCES = xf86XTrapModule.c

+

+

+# Sun IA extension module additions

diff -urp -x '*~' -x '*.orig' mi/miinitext.c mi/miinitext.c

@@ -84,6 +84,8 @@ SOFTWARE.

 #include "micmap.h"

 #include "globals.h"

+#define SolarisIAExtension

+

 #if defined(QNX4) /* sleaze for Watcom on QNX4 ... */

 #undef GLXEXT

 #endif

@@ -109,6 +111,7 @@ SOFTWARE.

 #undef DAMAGE

 #undef XFIXES

 #undef XEVIE

+#undef SolarisIAExtension

 #else

 #ifndef LOADABLEPRINTDDX

 #undef XPRINT

 #ifdef XV

 extern Bool noXvExtension;

 #endif

+#ifdef SolarisIAExtension

+Bool noIAExtension;

+#endif

 #ifndef XFree86LOADER

 #define INITARGS void

 #ifdef RES

 #include <X11/extensions/XResproto.h>

 #endif

+#ifdef SolarisIAExtension

+#include <X11/extensions/interactive.h>

+#endif

 /* FIXME: this whole block of externs should be from the appropriate headers */

 #ifdef EVI

 #ifdef COMPOSITE

 extern void CompositeExtensionInit(INITARGS);

 #endif

+#ifdef SolarisIAExtension

+extern void IAExtensionInit(void);

+#endif

 /* The following is only a small first step towards run-time

  * configurable extensions.

 #ifdef XSYNC

     { "SYNC", &noSyncExtension },

 #endif

+#ifdef SolarisIAExtension

+    { IANAME /* "SolarisIA" */, &noIAExtension },

+#endif    

 #ifdef TOGCUP

     { "TOG-CUP", &noXcupExtension },

 #endif

 #endif

+#ifdef SolarisIAExtension

+    if (!noIAExtension) IAExtensionInit();

+#endif

 }

 void