| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899 |
- diff -up xserver/configure.ac.vnc xserver/configure.ac
- --- xserver/configure.ac.vnc 2011-05-11 11:06:29.966753119 +0200
- +++ xserver/configure.ac 2011-05-11 11:06:37.286488408 +0200
- @@ -29,7 +29,6 @@ AC_PREREQ(2.57)
- AC_INIT([xorg-server], 1.6.5, [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
-
- RELEASE_DATE="2009-10-11"
-
- @@ -52,6 +51,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
- @@ -995,7 +995,7 @@ AC_DEFINE(SHAPE, 1, [Support SHAPE exten
-
- AC_DEFINE(XKB, 1, [Build XKB])
- AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
- -AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
- +AC_DEFINE(XKB_DFLT_DISABLED, 1, [Disable XKB per default])
- REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
- XKB_LIB='$(top_builddir)/xkb/libxkb.la'
- XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
- @@ -1199,6 +1199,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"])
-
- dnl Xnest DDX
-
- @@ -1234,6 +1237,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'
- @@ -1421,7 +1426,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])
- @@ -1875,6 +1879,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 2011-05-11 11:06:30.022751094 +0200
- +++ xserver/hw/Makefile.am 2011-05-11 11:06:37.286488408 +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:06:30.127747296 +0200
- +++ xserver/mi/miinitext.c 2011-05-11 11:07:10.182298769 +0200
- @@ -272,6 +272,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.
- @@ -438,6 +441,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();
|
