Attachment #351142 for bug #473518

Lines 72-77 dnl forcing an entire recompile.x Link Here

(-)tigervnc-1.2.0/unix/xserver/configure.ac.vnc (-1 / +8 lines)
72	AC_CONFIG_HEADERS(include/version-config.h)	72	AC_CONFIG_HEADERS(include/version-config.h)
73		73
74	AM_PROG_AS	74	AM_PROG_AS
		75	AC_PROG_CXX
75	AC_PROG_LN_S	76	AC_PROG_LN_S
76	AC_LIBTOOL_WIN32_DLL	77	AC_LIBTOOL_WIN32_DLL
77	AC_DISABLE_STATIC	78	AC_DISABLE_STATIC
Lines 1573-1578 if test "x$XVFB" = xyes; then Link Here
1573	AC_SUBST([XVFB_SYS_LIBS])	1574	AC_SUBST([XVFB_SYS_LIBS])
1574	fi	1575	fi
1575		1576
		1577	dnl Xvnc DDX
		1578	AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"])
		1579	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"])
		1580	AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"])
1576		1581
1577	dnl Xnest DDX	1582	dnl Xnest DDX
1578		1583
Lines 1608-1613 if test "x$XORG" = xauto; then Link Here
1608	fi	1613	fi
1609	AC_MSG_RESULT([$XORG])	1614	AC_MSG_RESULT([$XORG])
1610		1615
		1616	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
		1617
1611	if test "x$XORG" = xyes; then	1618	if test "x$XORG" = xyes; then
1612	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'	1619	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
1613	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'	1620	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
Lines 1826-1832 if test "x$XORG" = xyes; then Link Here
1826	AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])	1833	AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
1827	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])	1834	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
1828	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])	1835	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
1829	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
1830	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])	1836	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
1831	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])	1837	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
1832	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])	1838	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
Lines 2291-2296 hw/dmx/Makefile Link Here
2291	hw/dmx/man/Makefile	2297	hw/dmx/man/Makefile
2292	hw/vfb/Makefile	2298	hw/vfb/Makefile
2293	hw/vfb/man/Makefile	2299	hw/vfb/man/Makefile
		2300	hw/vnc/Makefile
2294	hw/xnest/Makefile	2301	hw/xnest/Makefile
2295	hw/xnest/man/Makefile	2302	hw/xnest/man/Makefile
2296	hw/xwin/Makefile	2303	hw/xwin/Makefile

Lines 33-39 SUBDIRS = \ Link Here

(-)tigervnc-1.2.0/unix/xserver/hw/Makefile.am.vnc (-1 / +2 lines)
33	$(XNEST_SUBDIRS) \	33	$(XNEST_SUBDIRS) \
34	$(DMX_SUBDIRS) \	34	$(DMX_SUBDIRS) \
35	$(KDRIVE_SUBDIRS) \	35	$(KDRIVE_SUBDIRS) \
36	$(XQUARTZ_SUBDIRS)	36	$(XQUARTZ_SUBDIRS) \
		37	vnc
37		38
38	DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive	39	DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive
39		40

Lines 112-117 SOFTWARE. Link Here

(-)tigervnc-1.2.0/unix/xserver/mi/miinitext.c.vnc (+7 lines)
112	#include "micmap.h"	112	#include "micmap.h"
113	#include "globals.h"	113	#include "globals.h"
114		114
		115	#ifdef TIGERVNC
		116	extern void vncExtensionInit(INITARGS);
		117	#endif
		118
115	/* The following is only a small first step towards run-time	119	/* The following is only a small first step towards run-time
116	* configurable extensions.	120	* configurable extensions.
117	*/	121	*/
Lines 302-307 static ExtensionModule staticExtensions[ Link Here
302	#ifdef XSELINUX	306	#ifdef XSELINUX
303	{SELinuxExtensionInit, SELINUX_EXTENSION_NAME, &noSELinuxExtension},	307	{SELinuxExtensionInit, SELINUX_EXTENSION_NAME, &noSELinuxExtension},
304	#endif	308	#endif
		309	#ifdef TIGERVNC
		310	{vncExtensionInit, "VNC-EXTENSION", NULL},
		311	#endif
305	};	312	};
306		313
307	static ExtensionModule *ExtensionModuleList = NULL;	314	static ExtensionModule *ExtensionModuleList = NULL;

Return to bug 473518