|
|
@@ -0,0 +1,86 @@ |
|
|
|
diff -up xserver/configure.ac.vnc xserver/configure.ac |
|
|
|
--- xserver/configure.ac.vnc 2010-12-08 17:09:34.459198307 +0100 |
|
|
|
+++ xserver/configure.ac 2010-12-08 17:09:46.789193164 +0100 |
|
|
|
@@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.9.99.1, [https: |
|
|
|
RELEASE_DATE="2010-10-01" |
|
|
|
AC_CONFIG_SRCDIR([Makefile.am]) |
|
|
|
AM_INIT_AUTOMAKE([foreign dist-bzip2]) |
|
|
|
-AM_MAINTAINER_MODE |
|
|
|
|
|
|
|
# Require xorg-macros minimum of 1.10 for XORG_CHECK_SGML_DOCTOOLS |
|
|
|
m4_ifndef([XORG_MACROS_VERSION], |
|
|
|
@@ -65,6 +64,7 @@ dnl forcing an entire recompile.x |
|
|
|
AC_CONFIG_HEADERS(include/version-config.h) |
|
|
|
|
|
|
|
AC_PROG_CC |
|
|
|
+AC_PROG_CXX |
|
|
|
AM_PROG_AS |
|
|
|
AC_PROG_INSTALL |
|
|
|
AC_PROG_LN_S |
|
|
|
@@ -1511,6 +1511,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 $RANDR_INC"]) |
|
|
|
+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 $MAIN_LIB"]) |
|
|
|
|
|
|
|
dnl Xnest DDX |
|
|
|
|
|
|
|
@@ -1549,6 +1552,8 @@ xorg_bus_linuxpci=no |
|
|
|
xorg_bus_bsdpci=no |
|
|
|
xorg_bus_sparc=no |
|
|
|
|
|
|
|
+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) |
|
|
|
+ |
|
|
|
if test "x$XORG" = xyes; then |
|
|
|
XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' |
|
|
|
XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' |
|
|
|
@@ -1793,7 +1798,6 @@ if test "x$XORG" = xyes; then |
|
|
|
AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) |
|
|
|
AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) |
|
|
|
AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server]) |
|
|
|
- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) |
|
|
|
AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) |
|
|
|
AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) |
|
|
|
AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) |
|
|
|
@@ -2245,6 +2249,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/xwin/glx/Makefile |
|
|
|
diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am |
|
|
|
--- xserver/hw/Makefile.am.vnc 2010-12-08 17:09:34.469198303 +0100 |
|
|
|
+++ xserver/hw/Makefile.am 2010-12-08 17:09:46.789193164 +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 2010-12-08 17:09:34.509198285 +0100 |
|
|
|
+++ xserver/mi/miinitext.c 2010-12-08 17:09:46.789193164 +0100 |
|
|
|
@@ -263,6 +263,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. |
|
|
|
@@ -435,6 +436,7 @@ InitExtensions(int argc, char *argv[]) |
|
|
|
#ifdef XF86BIGFONT |
|
|
|
if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit(); |
|
|
|
#endif |
|
|
|
+ vncExtensionInit(); |
|
|
|
#if !defined(NO_HW_ONLY_EXTS) |
|
|
|
#if defined(XF86VIDMODE) |
|
|
|
if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit(); |