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

1584N/Aindex f0fa2d8..2127601 100644

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

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

1584N/A@@ -58,6 +58,7 @@ SUBDIRS = \

705N/A $(GLX_DIR) \

1549N/A $(PRESENT_DIR) \

1549N/A $(DRI3_DIR) \

705N/A+ IA \

705N/A exa \

1549N/A $(GLAMOR_DIR) \

705N/A config \

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

1584N/Aindex c7379de..e09f020 100644

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

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

1584N/A@@ -1421,6 +1421,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)

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

1584N/A@@ -2636,3 +2640,6 @@ xserver.ent

98N/A xorg-server.pc

98N/A ])

1549N/A AC_OUTPUT

98N/A+

98N/A+# Add Sun IA extension

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

1584N/Adiff --git a/include/extinit.h b/include/extinit.h

1584N/Aindex fa5f293..62a0ab2 100644

1584N/A--- a/include/extinit.h

1584N/A+++ b/include/extinit.h

1584N/A@@ -121,6 +121,14 @@ extern _X_EXPORT Bool noMITShmExtension;

1584N/A extern void ShmExtensionInit(void);

1584N/A #endif

705N/A

1584N/A+#define SolarisIAExtension

98N/A+

1584N/A+#ifdef SolarisIAExtension

1584N/A+#include <X11/extensions/interactive.h>

1584N/A+extern _X_EXPORT Bool noIAExtension;

1584N/A+extern void IAExtensionInit(void);

1584N/A+#endif

1549N/A+

1584N/A extern void SyncExtensionInit(void);

1584N/A

1584N/A extern void XCMiscExtensionInit(void);

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

1584N/Aindex 5872bf5..a9a3826 100644

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

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

1584N/A@@ -150,6 +150,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

1584N/A@@ -296,6 +299,9 @@ static const ExtensionModule staticExtensions[] = {

1584N/A #ifdef RES

1584N/A {ResExtensionInit, XRES_NAME, &noResExtension},

1549N/A #endif

1584N/A+#ifdef SolarisIAExtension

1584N/A+ {IAExtensionInit, IANAME, &noIAExtension},

1584N/A+#endif

1584N/A #ifdef XV

1584N/A {XvExtensionInit, XvName, &noXvExtension},

1584N/A {XvMCExtensionInit, XvMCName, &noXvExtension},

1584N/Adiff --git a/os/utils.c b/os/utils.c

1584N/Aindex 1a070de..efaeef7 100644

1584N/A--- a/os/utils.c

1584N/A+++ b/os/utils.c

1584N/A@@ -184,6 +184,9 @@ Bool noXvExtension = FALSE;

1584N/A #ifdef DRI2

1584N/A Bool noDRI2Extension = FALSE;

1584N/A #endif

1584N/A+#ifdef SolarisIAExtension

1584N/A+Bool noIAExtension = FALSE;

1584N/A+#endif

1549N/A

1584N/A Bool noGEExtension = FALSE;

1584N/A