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