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