1422N/A# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.

98N/A#

98N/A# Permission is hereby granted, free of charge, to any person obtaining a

919N/A# copy of this software and associated documentation files (the "Software"),

919N/A# to deal in the Software without restriction, including without limitation

919N/A# the rights to use, copy, modify, merge, publish, distribute, sublicense,

919N/A# and/or sell copies of the Software, and to permit persons to whom the

919N/A# Software is furnished to do so, subject to the following conditions:

919N/A#

919N/A# The above copyright notice and this permission notice (including the next

919N/A# paragraph) shall be included in all copies or substantial portions of the

919N/A# Software.

919N/A#

919N/A# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

919N/A# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

919N/A# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

919N/A# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

919N/A# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

919N/A# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

919N/A# DEALINGS IN THE SOFTWARE.

1124N/Adiff --git a/Makefile.am b/Makefile.am

1351N/Aindex 9a62853..7ce17e3 100644

1124N/A--- a/Makefile.am

1124N/A+++ b/Makefile.am

1265N/A@@ -37,6 +37,7 @@ SUBDIRS = \

705N/A damageext \

705N/A $(COMPOSITE_DIR) \

705N/A $(GLX_DIR) \

705N/A+ IA \

705N/A exa \

705N/A config \

851N/A hw \

1124N/Adiff --git a/configure.ac b/configure.ac

1351N/Aindex 28eb2f1..5a8e173 100644

1124N/A--- a/configure.ac

1124N/A+++ b/configure.ac

1351N/A@@ -1214,6 +1214,10 @@ AC_DEFINE(XINPUT, 1, [Support X Input extension])

606N/A XI_LIB='$(top_builddir)/Xi/libXi.la'

606N/A XI_INC='-I$(top_srcdir)/Xi'

235N/A

235N/A+# SolarisIA extension

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

851N/A+XEXT_LIB="${XEXT_LIB} ${IA_LIB}"

235N/A+

235N/A AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes)

851N/A AM_CONDITIONAL(VGAHW, test "x$VGAHW" = xyes)

1351N/A AM_CONDITIONAL(VBE, test "x$VBE" = xyes)

1351N/A@@ -2312,3 +2316,6 @@ test/xi2/Makefile

1265N/A xserver.ent

98N/A xorg-server.pc

98N/A ])

98N/A+

98N/A+# Add Sun IA extension

98N/A+AC_OUTPUT([IA/Makefile])

1124N/Adiff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c

1351N/Aindex c2cfc90..907a103 100644

1124N/A--- a/hw/xfree86/common/xf86Config.c

1124N/A+++ b/hw/xfree86/common/xf86Config.c

1351N/A@@ -117,6 +117,7 @@ static ModuleDefault ModuleDefaults[] = {

1351N/A {.name = "fb",.toLoad = TRUE,.load_opt = NULL},

1351N/A {.name = "shadow",.toLoad = TRUE,.load_opt = NULL},

606N/A #endif

1276N/A+ {.name = "ia",.toLoad = TRUE,.load_opt = NULL},

1276N/A {.name = NULL,.toLoad = FALSE,.load_opt = NULL}

606N/A };

98N/A

1124N/Adiff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am

1351N/Aindex f161db6..fd524c5 100644

1124N/A--- a/hw/xfree86/dixmods/Makefile.am

1124N/A+++ b/hw/xfree86/dixmods/Makefile.am

1351N/A@@ -48,3 +48,11 @@ libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c

1351N/A libdixmods_la_CFLAGS = $(AM_CFLAGS)

705N/A

705N/A libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c

98N/A+

98N/A+

98N/A+# Sun IA extension module additions

606N/A+extsmodule_LTLIBRARIES += libia.la

1422N/A+libia_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/IA

606N/A+libia_la_LDFLAGS = -avoid-version

606N/A+libia_la_LIBADD = $(top_builddir)/IA/libIA.la

606N/A+libia_la_SOURCES = iamodule.c

1124N/Adiff --git a/mi/miinitext.c b/mi/miinitext.c

1351N/Aindex d175440..720dca4 100644

1124N/A--- a/mi/miinitext.c

1124N/A+++ b/mi/miinitext.c

1351N/A@@ -151,6 +151,9 @@ static ExtensionToggle ExtensionToggleList[] = {

705N/A #ifdef XCSECURITY

1276N/A {"SECURITY", &noSecurityExtension},

235N/A #endif

235N/A+#ifdef SolarisIAExtension

235N/A+ { IANAME /* "SolarisIA" */, &noIAExtension },

1088N/A+#endif

705N/A #ifdef RES

1276N/A {"X-Resource", &noResExtension},

235N/A #endif