| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091 |
- diff -up xserver/configure.ac.vnc xserver/configure.ac
- --- xserver/configure.ac.vnc 2012-08-28 15:01:35.142325880 +0200
- +++ xserver/configure.ac 2012-08-28 15:02:06.292300682 +0200
- @@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.12.4, [https://
- RELEASE_DATE="2012-08-27"
- AC_CONFIG_SRCDIR([Makefile.am])
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
- -AM_MAINTAINER_MODE
-
- # Require xorg-macros minimum of 1.14 for XORG_COMPILER_BRAND in XORG_DEFAULT_OPTIONS
- m4_ifndef([XORG_MACROS_VERSION],
- @@ -72,6 +71,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
- @@ -1493,6 +1493,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
-
- @@ -1527,6 +1531,8 @@ if test "x$XORG" = xauto; then
- fi
- AC_MSG_RESULT([$XORG])
-
- +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'
- @@ -1743,7 +1749,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])
- @@ -2209,6 +2214,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 2012-08-28 15:01:35.225325813 +0200
- +++ xserver/hw/Makefile.am 2012-08-28 15:02:06.292300682 +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 2012-08-28 15:01:35.311325743 +0200
- +++ xserver/mi/miinitext.c 2012-08-28 15:02:06.293300681 +0200
- @@ -266,6 +266,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.
- @@ -449,6 +452,9 @@ InitExtensions(int argc, char *argv[])
- if (!noXFree86BigfontExtension)
- XFree86BigfontExtensionInit();
- #endif
- +#ifdef TIGERVNC
- + vncExtensionInit();
- +#endif
- #if !defined(NO_HW_ONLY_EXTS)
- #if defined(XF86VIDMODE)
- if (!noXFree86VidModeExtension)
|
