1351N/A--- a/configure.ac Fri Sep 14 10:22:01 2012
1351N/A+++ b/configure.ac Fri Sep 14 10:29:14 2012
1351N/A@@ -137,7 +137,7 @@
1351N/A
1351N/A dnl Checks for typedefs, structures, and compiler characteristics.
1351N/A AC_C_CONST
1351N/A-AC_C_TYPEOF
1351N/A+#AC_C_TYPEOF
1351N/A AC_C_BIGENDIAN([ENDIAN="X_BIG_ENDIAN"], [ENDIAN="X_LITTLE_ENDIAN"])
1351N/A
1351N/A AC_CHECK_SIZEOF([unsigned long])
1351N/A--- a/configure.ac Fri Sep 14 11:00:59 2012
1351N/A+++ b/configure.ac Fri Sep 14 11:03:09 2012
1351N/A@@ -1515,7 +1515,7 @@
1351N/A # Some platforms require extra flags to do this. libtool should set the
1351N/A # necessary flags for each platform when -export-dynamic is passed to it.
1351N/A LD_EXPORT_SYMBOLS_FLAG="-export-dynamic"
1351N/A-LD_NO_UNDEFINED_FLAG=
1351N/A+#LD_NO_UNDEFINED_FLAG=
1351N/A XORG_DRIVER_LIBS=
1351N/A case "$host_os" in
1351N/A cygwin*)
1351N/A--- a/configure.ac Fri Sep 14 11:23:41 2012
1351N/A+++ b/configure.ac Fri Sep 14 11:25:54 2012
1351N/A@@ -1534,7 +1534,7 @@
1351N/A [AC_LANG_SOURCE([int main(int argc, char **argv) { return 0; }])],
1351N/A [mv conftest$EXEEXT conftest.parent
1351N/A XORG_CHECK_LINKER_FLAGS([-Wl,-z,parent=conftest.parent -G],
1351N/A- [LD_NO_UNDEFINED_FLAG="-Wl,-z,defs -Wl,-z,parent=\$(top_builddir)/hw/xfree86/Xorg"
1351N/A+ [LD_NO_UNDEFINED_FLAG="-Wl,-z,defs -Wl,-z,parent=\${bindir}/Xorg"
1351N/A # Not set yet, since this gets exported in xorg-server.pc to all the drivers,
1351N/A # and they're not all fixed to build correctly with it yet.
1351N/A # XORG_DRIVER_LIBS="-Wl,-z,defs -Wl,-z,parent=${bindir}/Xorg"
1351N/A--- a/hw/xfree86/Makefile.am Fri Sep 14 11:42:50 2012
1351N/A+++ b/hw/xfree86/Makefile.am Fri Sep 14 11:45:34 2012
1351N/A@@ -41,7 +41,7 @@
1351N/A AM_CFLAGS = $(DIX_CFLAGS) $(PIXMAN_CFLAGS) @XORG_CFLAGS@
1351N/A INCLUDES = $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
1351N/A -I$(srcdir)/ddc -I$(srcdir)/i2c -I$(srcdir)/modes -I$(srcdir)/ramdac \
1351N/A- -I$(srcdir)/dri -I$(srcdir)/dri2
1351N/A+ -I$(srcdir)/dri -I$(srcdir)/dri2 -I$(PROTODIR)/usr/include/X11/dri
1351N/A
1351N/A LOCAL_LIBS = \
1351N/A $(MAIN_LIB) \
1351N/A--- a/mi/miinitext.c Fri Sep 14 15:27:58 2012
1351N/A+++ b/mi/miinitext.c Fri Sep 14 15:28:25 2012
1351N/A@@ -121,6 +121,21 @@
1351N/A Bool *disablePtr;
1351N/A } ExtensionToggle;
1351N/A
1351N/A+#define SolarisIAExtension
1351N/A+
1351N/A+#ifdef SolarisIAExtension
1351N/A+#include <X11/extensions/interactive.h>
1351N/A+#include "../IA/interactive_srv.h"
1351N/A+Bool noIAExtension;
1351N/A+extern void IAExtensionInit(void);
1351N/A+#endif
1351N/A+
1351N/A+#ifdef TSOL
1351N/A+#include "../tsol/tsolextension.h"
1351N/A+Bool noXTSolExtension;
1351N/A+extern void TsolExtensionInit(void);
1351N/A+#endif
1351N/A+
1351N/A static ExtensionToggle ExtensionToggleList[] = {
1351N/A /* sort order is extension name string as shown in xdpyinfo */
1351N/A {"Generic Events", &noGEExtension},
1351N/A--- a/include/globals.h Tue Sep 25 14:45:20 2012
1351N/A+++ b/include/globals.h Tue Sep 25 14:45:35 2012
1351N/A@@ -50,4 +50,8 @@
1351N/A extern _X_EXPORT int selinuxEnforcingState;
1351N/A #endif
1351N/A
1351N/A+#ifdef XF86DRI
1351N/A+extern _X_EXPORT Bool noXFree86DRIExtension;
1351N/A+#endif
1351N/A+
1351N/A #endif /* !_XSERV_GLOBAL_H_ */