1549N/A--- xserver/hw/Makefile.am Tue Nov 11 15:23:36 2014

1549N/A+++ xserver/hw/Makefile.am Tue Nov 11 15:23:58 2014

1549N/A@@ -38,7 +38,8 @@

1549N/A $(DMX_SUBDIRS) \

1549N/A $(KDRIVE_SUBDIRS) \

1549N/A $(XQUARTZ_SUBDIRS) \

1549N/A- $(XWAYLAND_SUBDIRS)

1549N/A+ $(XWAYLAND_SUBDIRS) \

1549N/A+ vnc

1549N/A

1549N/A DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xwayland

1549N/A

1549N/A--- xserver/configure.ac Tue Nov 11 15:24:35 2014

1549N/A+++ xserver/configure.ac Tue Nov 11 15:27:45 2014

1549N/A@@ -74,6 +74,7 @@

1549N/A AC_CONFIG_HEADERS(include/version-config.h)

1549N/A

1549N/A AM_PROG_AS

1549N/A+AC_PROG_CXX

1549N/A AC_PROG_LN_S

1549N/A LT_PREREQ([2.2])

1549N/A LT_INIT([disable-static win32-dll])

1549N/A@@ -1818,7 +1819,15 @@

1549N/A AC_SUBST([XVFB_SYS_LIBS])

1549N/A fi

1549N/A

1549N/A+dnl Xvnc DDX

1549N/A+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC $RANDR_INC"])

1549N/A+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])

1549N/A+AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"])

1549N/A

1549N/A+dnl This is necessary to allow Xvnc to statically link with GnuTLS

1549N/A+AC_ARG_VAR(GNUTLS_LDFLAGS, [Custom linker flags for using GnuTLS, e.g. -L{GnuTLS directory}/lib -lgnutls])

1549N/A+AC_SUBST(GNUTLS_LDFLAGS)

1549N/A+

1549N/A dnl Xnest DDX

1549N/A

1549N/A PKG_CHECK_MODULES(XNESTMODULES, [$LIBXEXT x11 xau $XDMCP_MODULES], [have_xnest=yes], [have_xnest=no])

1549N/A@@ -1854,6 +1863,7 @@

1549N/A esac

1549N/A fi

1549N/A AC_MSG_RESULT([$XORG])

1549N/A+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])

1549N/A

1549N/A if test "x$XORG" = xyes; then

1549N/A XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'

1549N/A@@ -2076,7 +2086,7 @@

1549N/A AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])

1549N/A AC_DEFINE(XORGSERVER, 1, [Building Xorg server])

1549N/A AC_DEFINE(XFree86Server, 1, [Building XFree86 server])

1549N/A- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])

1549N/A+ AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server])

1549N/A AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])

1549N/A AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])

1549N/A AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])

1549N/A@@ -2615,6 +2625,7 @@

1549N/A hw/dmx/man/Makefile

1549N/A hw/vfb/Makefile

1549N/A hw/vfb/man/Makefile

1549N/A+hw/vnc/Makefile

1549N/A hw/xnest/Makefile

1549N/A hw/xnest/man/Makefile

1549N/A hw/xwin/Makefile

1549N/A--- xserver/mi/miinitext.c Tue Nov 11 15:22:55 2014

1549N/A+++ xserver/mi/miinitext.c Tue Nov 11 15:28:19 2014

1549N/A@@ -135,6 +135,10 @@

1584N/A extern void IAExtensionInit(void);

1549N/A #endif

1549N/A

1549N/A+#ifdef TIGERVNC

1549N/A+extern void vncExtensionInit(INITARGS);

1549N/A+#endif

1549N/A+

1549N/A static ExtensionToggle ExtensionToggleList[] = {

1549N/A /* sort order is extension name string as shown in xdpyinfo */

1549N/A {"Generic Events", &noGEExtension},

1549N/A@@ -309,6 +313,9 @@

1549N/A #ifdef DPMSExtension

1549N/A {DPMSExtensionInit, DPMSExtensionName, &noDPMSExtension},

1549N/A #endif

1549N/A+#ifdef TIGERVNC

1549N/A+ {vncExtensionInit, "VNC", NULL},

1549N/A+#endif

1549N/A #ifdef PRESENT

1549N/A {present_extension_init, PRESENT_NAME, NULL},

1549N/A #endif