blob: cadf748c43bde2bd1df89f01400ac87b83fc18c1 [file] [log] [blame]
Adam Tkac43df9132009-01-05 15:33:13 +00001diff -up xserver/configure.ac.vnc xserver/configure.ac
Adam Tkac60909b52009-02-25 10:53:36 +00002--- xserver/configure.ac.vnc 2009-02-25 11:45:20.000000000 +0100
3+++ xserver/configure.ac 2009-02-25 11:49:37.000000000 +0100
Adam Tkac43df9132009-01-05 15:33:13 +00004@@ -29,7 +29,6 @@ AC_PREREQ(2.57)
Adam Tkac60909b52009-02-25 10:53:36 +00005 AC_INIT([xorg-server], 1.5.99.903, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
Adam Tkac43df9132009-01-05 15:33:13 +00006 AC_CONFIG_SRCDIR([Makefile.am])
7 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
8-AM_MAINTAINER_MODE
9
Adam Tkac60909b52009-02-25 10:53:36 +000010 RELEASE_DATE="2009-2-17"
Adam Tkac84496812009-02-04 17:02:03 +000011
12@@ -52,6 +51,7 @@ dnl kdrive-config.h covers the kdrive DD
Adam Tkac43df9132009-01-05 15:33:13 +000013 AC_CONFIG_HEADERS(include/kdrive-config.h)
14
15 AC_PROG_CC
16+AC_PROG_CXX
17 AM_PROG_AS
18 AC_PROG_INSTALL
19 AC_PROG_LN_S
Adam Tkac60909b52009-02-25 10:53:36 +000020@@ -1195,6 +1195,9 @@ if test "x$XVFB" = xyes; then
Adam Tkac43df9132009-01-05 15:33:13 +000021 AC_SUBST([XVFB_SYS_LIBS])
22 fi
23
24+dnl Xvnc DDX
25+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC"])
Adam Tkace3c3e4a2009-01-07 17:12:00 +000026+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_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB"])
Adam Tkac43df9132009-01-05 15:33:13 +000027
28 dnl Xnest DDX
29
Adam Tkac60909b52009-02-25 10:53:36 +000030@@ -1230,6 +1233,8 @@ xorg_bus_linuxpci=no
31 xorg_bus_bsdpci=no
32 xorg_bus_sparc=no
33
34+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
35+
36 if test "x$XORG" = xyes; then
37 XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
38 XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
39@@ -1417,7 +1422,6 @@ if test "x$XORG" = xyes; then
40 AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
41 AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
42 AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server])
43- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
44 AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
45 AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
46 AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
47@@ -1871,6 +1875,7 @@ hw/dmx/input/Makefile
Adam Tkac43df9132009-01-05 15:33:13 +000048 hw/dmx/glxProxy/Makefile
49 hw/dmx/Makefile
50 hw/vfb/Makefile
51+hw/vnc/Makefile
52 hw/xnest/Makefile
53 hw/xwin/Makefile
54 hw/xquartz/Makefile
55diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am
Adam Tkac60909b52009-02-25 10:53:36 +000056--- xserver/hw/Makefile.am.vnc 2009-02-25 11:45:20.000000000 +0100
57+++ xserver/hw/Makefile.am 2009-02-25 11:45:37.000000000 +0100
Adam Tkac43df9132009-01-05 15:33:13 +000058@@ -33,7 +33,8 @@ SUBDIRS = \
59 $(XNEST_SUBDIRS) \
60 $(DMX_SUBDIRS) \
61 $(KDRIVE_SUBDIRS) \
62- $(XQUARTZ_SUBDIRS)
63+ $(XQUARTZ_SUBDIRS) \
64+ vnc
65
66 DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive
67
68diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c
Adam Tkac60909b52009-02-25 10:53:36 +000069--- xserver/mi/miinitext.c.vnc 2009-02-25 11:45:21.000000000 +0100
70+++ xserver/mi/miinitext.c 2009-02-25 11:45:37.000000000 +0100
Adam Tkac43df9132009-01-05 15:33:13 +000071@@ -272,6 +272,7 @@ extern void DamageExtensionInit(INITARGS
72 extern void CompositeExtensionInit(INITARGS);
73 #endif
74 extern void GEExtensionInit(INITARGS);
75+extern void vncExtensionInit(INITARGS);
76
77 /* The following is only a small first step towards run-time
78 * configurable extensions.
79@@ -477,6 +478,7 @@ InitExtensions(int argc, char *argv[])
80 GlxPushProvider(&__glXDRISWRastProvider);
81 if (!noGlxExtension) GlxExtensionInit();
82 #endif
83+ vncExtensionInit();
84 }
85
86 #else /* XFree86LOADER */