# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.

#

# 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, sublicense,

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

# Software is furnished to do so, subject to the following conditions:

#

# The above copyright notice and this permission notice (including the next

# paragraph) shall be included in all copies or substantial portions of the

# Software.

#

# 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. IN NO EVENT SHALL

# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

# DEALINGS IN THE SOFTWARE.

diff --git a/Makefile.am b/Makefile.am

index 9a62853..7ce17e3 100644

--- a/Makefile.am

+++ b/Makefile.am

@@ -37,6 +37,7 @@ SUBDIRS = \

damageext \

$(COMPOSITE_DIR) \

$(GLX_DIR) \

+ IA \

exa \

config \

hw \

diff --git a/configure.ac b/configure.ac

index 28eb2f1..5a8e173 100644

--- a/configure.ac

+++ b/configure.ac

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

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

XI_INC='-I$(top_srcdir)/Xi'

+# SolarisIA extension

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

+XEXT_LIB="${XEXT_LIB} ${IA_LIB}"

+

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

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

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

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

xserver.ent

xorg-server.pc

])

+

+# Add Sun IA extension

+AC_OUTPUT([IA/Makefile])

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c

index c2cfc90..907a103 100644

--- a/hw/xfree86/common/xf86Config.c

+++ b/hw/xfree86/common/xf86Config.c

@@ -117,6 +117,7 @@ static ModuleDefault ModuleDefaults[] = {

{.name = "fb",.toLoad = TRUE,.load_opt = NULL},

{.name = "shadow",.toLoad = TRUE,.load_opt = NULL},

#endif

+ {.name = "ia",.toLoad = TRUE,.load_opt = NULL},

{.name = NULL,.toLoad = FALSE,.load_opt = NULL}

};

diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am

index f161db6..fd524c5 100644

--- a/hw/xfree86/dixmods/Makefile.am

+++ b/hw/xfree86/dixmods/Makefile.am

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

libdixmods_la_CFLAGS = $(AM_CFLAGS)

libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c

+

+

+# Sun IA extension module additions

+extsmodule_LTLIBRARIES += libia.la

+libia_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/IA

+libia_la_LDFLAGS = -avoid-version

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

+libia_la_SOURCES = iamodule.c

diff --git a/mi/miinitext.c b/mi/miinitext.c

index d175440..720dca4 100644

--- a/mi/miinitext.c

+++ b/mi/miinitext.c

@@ -151,6 +151,9 @@ static ExtensionToggle ExtensionToggleList[] = {

#ifdef XCSECURITY

{"SECURITY", &noSecurityExtension},

#endif

+#ifdef SolarisIAExtension

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

+#endif

#ifdef RES

{"X-Resource", &noResExtension},

#endif