diff -up xserver/configure.ac.vnc xserver/configure.ac --- xserver/configure.ac.vnc 2011-05-11 11:19:24.410708163 +0200 +++ xserver/configure.ac 2011-05-11 11:19:26.409635824 +0200 @@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.10.1.901, [http RELEASE_DATE="2011-05-06" 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) AM_PROG_AS +AC_PROG_CXX AC_PROG_LN_S AC_LIBTOOL_WIN32_DLL AC_DISABLE_STATIC @@ -1513,6 +1513,10 @@ 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_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"]) +AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"]) dnl Xnest DDX @@ -1551,6 +1555,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' @@ -1797,7 +1803,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]) @@ -2259,6 +2264,7 @@ hw/dmx/Makefile hw/dmx/man/Makefile hw/vfb/Makefile hw/vfb/man/Makefile +hw/vnc/Makefile hw/xnest/Makefile hw/xnest/man/Makefile hw/xwin/Makefile diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am --- xserver/hw/Makefile.am.vnc 2011-05-11 11:19:24.476705776 +0200 +++ xserver/hw/Makefile.am 2011-05-11 11:19:26.409635824 +0200 @@ -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 2011-05-11 11:19:24.549703133 +0200 +++ xserver/mi/miinitext.c 2011-05-11 11:19:42.022070885 +0200 @@ -263,6 +263,9 @@ extern void DamageExtensionInit(INITARGS extern void CompositeExtensionInit(INITARGS); #endif extern void GEExtensionInit(INITARGS); +#ifdef TIGERVNC +extern void vncExtensionInit(INITARGS); +#endif /* The following is only a small first step towards run-time * configurable extensions. @@ -433,6 +436,9 @@ InitExtensions(int argc, char *argv[]) #ifdef XF86BIGFONT if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit(); #endif +#ifdef TIGERVNC + vncExtensionInit(); +#endif #if !defined(NO_HW_ONLY_EXTS) #if defined(XF86VIDMODE) if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit();