| Adam Tkac | f515c00 | 2010-07-20 09:35:50 +0000 | [diff] [blame^] | 1 | diff -up xserver/configure.ac.vnc xserver/configure.ac |
| 2 | --- xserver/configure.ac.vnc 2010-07-20 11:34:55.086181932 +0200 |
| 3 | +++ xserver/configure.ac 2010-07-20 11:35:02.196706133 +0200 |
| 4 | @@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.8.99.905, [http |
| 5 | RELEASE_DATE="2010-07-14" |
| 6 | AC_CONFIG_SRCDIR([Makefile.am]) |
| 7 | AM_INIT_AUTOMAKE([foreign dist-bzip2]) |
| 8 | -AM_MAINTAINER_MODE |
| 9 | |
| 10 | # Require xorg-macros: XORG_DEFAULT_OPTIONS |
| 11 | m4_ifndef([XORG_MACROS_VERSION], |
| 12 | @@ -64,6 +63,7 @@ dnl forcing an entire recompile.x |
| 13 | AC_CONFIG_HEADERS(include/version-config.h) |
| 14 | |
| 15 | AC_PROG_CC |
| 16 | +AC_PROG_CXX |
| 17 | AM_PROG_AS |
| 18 | AC_PROG_INSTALL |
| 19 | AC_PROG_LN_S |
| 20 | @@ -1512,6 +1512,9 @@ if test "x$XVFB" = xyes; then |
| 21 | AC_SUBST([XVFB_SYS_LIBS]) |
| 22 | fi |
| 23 | |
| 24 | +dnl Xvnc DDX |
| 25 | +AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC $RANDR_INC"]) |
| 26 | +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"]) |
| 27 | |
| 28 | dnl Xnest DDX |
| 29 | |
| 30 | @@ -1550,6 +1553,8 @@ xorg_bus_linuxpci=no |
| 31 | xorg_bus_bsdpci=no |
| 32 | xorg_bus_sparc=no |
| 33 | |
| 34 | +AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) |
| 35 | + |
| 36 | if test "x$XORG" = xyes; then |
| 37 | XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' |
| 38 | XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' |
| 39 | @@ -1796,7 +1801,6 @@ if test "x$XORG" = xyes; then |
| 40 | AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) |
| 41 | AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) |
| 42 | AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server]) |
| 43 | - AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) |
| 44 | AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) |
| 45 | AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) |
| 46 | AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) |
| 47 | @@ -2246,6 +2250,7 @@ hw/dmx/input/Makefile |
| 48 | hw/dmx/glxProxy/Makefile |
| 49 | hw/dmx/Makefile |
| 50 | hw/vfb/Makefile |
| 51 | +hw/vnc/Makefile |
| 52 | hw/xnest/Makefile |
| 53 | hw/xwin/Makefile |
| 54 | hw/xwin/glx/Makefile |
| 55 | diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am |
| 56 | --- xserver/hw/Makefile.am.vnc 2010-07-20 11:34:55.276195912 +0200 |
| 57 | +++ xserver/hw/Makefile.am 2010-07-20 11:35:02.196706133 +0200 |
| 58 | @@ -33,7 +33,8 @@ SUBDIRS = \ |
| 59 | $(XNEST_SUBDIRS) \ |
| 60 | $(DMX_SUBDIRS) \ |
| 61 | $(KDRIVE_SUBDIRS) \ |
| 62 | - $(XQUARTZ_SUBDIRS) |
| 63 | + $(XQUARTZ_SUBDIRS) \ |
| 64 | + vnc |
| 65 | |
| 66 | DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive |
| 67 | |
| 68 | diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c |
| 69 | --- xserver/mi/miinitext.c.vnc 2010-07-20 11:34:55.286196649 +0200 |
| 70 | +++ xserver/mi/miinitext.c 2010-07-20 11:35:02.196706133 +0200 |
| 71 | @@ -263,6 +263,7 @@ extern void DamageExtensionInit(INITARGS |
| 72 | extern void CompositeExtensionInit(INITARGS); |
| 73 | #endif |
| 74 | extern void GEExtensionInit(INITARGS); |
| 75 | +extern void vncExtensionInit(INITARGS); |
| 76 | |
| 77 | /* The following is only a small first step towards run-time |
| 78 | * configurable extensions. |
| 79 | @@ -435,6 +436,7 @@ InitExtensions(int argc, char *argv[]) |
| 80 | #ifdef XF86BIGFONT |
| 81 | if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit(); |
| 82 | #endif |
| 83 | + vncExtensionInit(); |
| 84 | #if !defined(NO_HW_ONLY_EXTS) |
| 85 | #if defined(XF86VIDMODE) |
| 86 | if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit(); |