|
|
@@ -0,0 +1,69 @@ |
|
|
|
diff -up xserver/configure.ac.vnc xserver/configure.ac |
|
|
|
--- xserver/configure.ac.vnc 2009-01-05 13:40:51.000000000 +0100 |
|
|
|
+++ xserver/configure.ac 2009-01-05 13:48:18.000000000 +0100 |
|
|
|
@@ -29,7 +29,6 @@ AC_PREREQ(2.57) |
|
|
|
AC_INIT([xorg-server], 1.5.99.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) |
|
|
|
AC_CONFIG_SRCDIR([Makefile.am]) |
|
|
|
AM_INIT_AUTOMAKE([dist-bzip2 foreign]) |
|
|
|
-AM_MAINTAINER_MODE |
|
|
|
|
|
|
|
dnl this gets generated by autoheader, and thus contains all the defines. we |
|
|
|
dnl don't ever actually use it, internally. |
|
|
|
@@ -50,6 +49,7 @@ dnl kdrive-config.h covers the kdrive DD |
|
|
|
AC_CONFIG_HEADERS(include/kdrive-config.h) |
|
|
|
|
|
|
|
AC_PROG_CC |
|
|
|
+AC_PROG_CXX |
|
|
|
AM_PROG_AS |
|
|
|
AC_PROG_INSTALL |
|
|
|
AC_PROG_LN_S |
|
|
|
@@ -1208,6 +1208,9 @@ if test "x$XVFB" = xyes; then |
|
|
|
AC_SUBST([XVFB_SYS_LIBS]) |
|
|
|
fi |
|
|
|
|
|
|
|
+dnl Xvnc DDX |
|
|
|
+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC"]) |
|
|
|
+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB"]) |
|
|
|
|
|
|
|
dnl Xnest DDX |
|
|
|
|
|
|
|
@@ -1884,6 +1887,7 @@ hw/dmx/input/Makefile |
|
|
|
hw/dmx/glxProxy/Makefile |
|
|
|
hw/dmx/Makefile |
|
|
|
hw/vfb/Makefile |
|
|
|
+hw/vnc/Makefile |
|
|
|
hw/xnest/Makefile |
|
|
|
hw/xwin/Makefile |
|
|
|
hw/xquartz/Makefile |
|
|
|
diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am |
|
|
|
--- xserver/hw/Makefile.am.vnc 2009-01-05 13:48:29.000000000 +0100 |
|
|
|
+++ xserver/hw/Makefile.am 2009-01-05 13:48:42.000000000 +0100 |
|
|
|
@@ -33,7 +33,8 @@ SUBDIRS = \ |
|
|
|
$(XNEST_SUBDIRS) \ |
|
|
|
$(DMX_SUBDIRS) \ |
|
|
|
$(KDRIVE_SUBDIRS) \ |
|
|
|
- $(XQUARTZ_SUBDIRS) |
|
|
|
+ $(XQUARTZ_SUBDIRS) \ |
|
|
|
+ vnc |
|
|
|
|
|
|
|
DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive |
|
|
|
|
|
|
|
diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c |
|
|
|
--- xserver/mi/miinitext.c.vnc 2009-01-05 13:48:52.000000000 +0100 |
|
|
|
+++ xserver/mi/miinitext.c 2009-01-05 13:51:24.000000000 +0100 |
|
|
|
@@ -272,6 +272,7 @@ extern void DamageExtensionInit(INITARGS |
|
|
|
extern void CompositeExtensionInit(INITARGS); |
|
|
|
#endif |
|
|
|
extern void GEExtensionInit(INITARGS); |
|
|
|
+extern void vncExtensionInit(INITARGS); |
|
|
|
|
|
|
|
/* The following is only a small first step towards run-time |
|
|
|
* configurable extensions. |
|
|
|
@@ -477,6 +478,7 @@ InitExtensions(int argc, char *argv[]) |
|
|
|
GlxPushProvider(&__glXDRISWRastProvider); |
|
|
|
if (!noGlxExtension) GlxExtensionInit(); |
|
|
|
#endif |
|
|
|
+ vncExtensionInit(); |
|
|
|
} |
|
|
|
|
|
|
|
#else /* XFree86LOADER */ |