]>
Commit | Line | Data |
---|---|---|
68652edc MK |
1 | diff -up xserver/configure.ac.vnc xserver/configure.ac |
2 | --- xserver/configure.ac.vnc 2012-08-28 15:35:23.778810954 +0200 | |
3 | +++ xserver/configure.ac 2012-08-28 15:54:46.396743431 +0200 | |
4 | @@ -73,6 +72,7 @@ dnl forcing an entire recompile.x | |
5 | AC_CONFIG_HEADERS(include/version-config.h) | |
6 | ||
7 | AM_PROG_AS | |
8 | +AC_PROG_CXX | |
9 | AC_PROG_LN_S | |
10 | AC_LIBTOOL_WIN32_DLL | |
11 | AC_DISABLE_STATIC | |
12 | @@ -1561,6 +1561,10 @@ if test "x$XVFB" = xyes; then | |
13 | AC_SUBST([XVFB_SYS_LIBS]) | |
14 | fi | |
15 | ||
16 | +dnl Xvnc DDX | |
17 | +AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"]) | |
aa94f70a | 18 | +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 $PRESENT_LIB $DRI3_LIB"]) |
68652edc MK |
19 | +AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"]) |
20 | ||
21 | dnl Xnest DDX | |
22 | ||
23 | @@ -1596,6 +1600,8 @@ if test "x$XORG" = xauto; then | |
24 | fi | |
25 | AC_MSG_RESULT([$XORG]) | |
26 | ||
27 | +AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | |
28 | + | |
29 | if test "x$XORG" = xyes; then | |
30 | XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' | |
31 | XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' | |
32 | @@ -1815,7 +1821,6 @@ if test "x$XORG" = xyes; then | |
33 | AC_DEFINE(XORG_SERVER, 1, [Building Xorg server]) | |
34 | AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) | |
35 | AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) | |
36 | - AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | |
37 | AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) | |
38 | AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) | |
39 | AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) | |
40 | @@ -2280,6 +2285,7 @@ hw/dmx/Makefile | |
41 | hw/dmx/man/Makefile | |
42 | hw/vfb/Makefile | |
43 | hw/vfb/man/Makefile | |
44 | +hw/vnc/Makefile | |
45 | hw/xnest/Makefile | |
46 | hw/xnest/man/Makefile | |
47 | hw/xwin/Makefile | |
48 | diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am | |
49 | --- xserver/hw/Makefile.am.vnc 2012-08-28 15:35:23.856810890 +0200 | |
50 | +++ xserver/hw/Makefile.am 2012-08-28 15:35:42.272795917 +0200 | |
51 | @@ -33,7 +33,8 @@ SUBDIRS = \ | |
68652edc MK |
52 | $(DMX_SUBDIRS) \ |
53 | $(KDRIVE_SUBDIRS) \ | |
d30780fd JR |
54 | $(XQUARTZ_SUBDIRS) \ |
55 | - $(XWAYLAND_SUBDIRS) | |
56 | + $(XWAYLAND_SUBDIRS) \ | |
68652edc MK |
57 | + vnc |
58 | ||
d30780fd | 59 | DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xwayland |
68652edc MK |
60 | |
61 | diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c | |
62 | --- xserver/mi/miinitext.c.vnc 2012-08-28 15:35:23.000000000 +0200 | |
63 | +++ xserver/mi/miinitext.c 2012-09-05 15:07:40.714953972 +0200 | |
64 | @@ -112,6 +112,10 @@ SOFTWARE. | |
65 | #include "micmap.h" | |
66 | #include "globals.h" | |
67 | ||
68 | +#ifdef TIGERVNC | |
69 | +extern void vncExtensionInit(INITARGS); | |
70 | +#endif | |
71 | + | |
72 | /* The following is only a small first step towards run-time | |
73 | * configurable extensions. | |
74 | */ | |
75 | @@ -299,6 +303,9 @@ static ExtensionModule staticExtensions[ | |
76 | #ifdef XSELINUX | |
77 | {SELinuxExtensionInit, SELINUX_EXTENSION_NAME, &noSELinuxExtension}, | |
78 | #endif | |
79 | +#ifdef TIGERVNC | |
80 | + {vncExtensionInit, "VNC-EXTENSION", NULL}, | |
81 | +#endif | |
82 | }; | |
83 | ||
84 | static ExtensionModule *ExtensionModuleList = NULL; |