| Adam Tkac | 43df913 | 2009-01-05 15:33:13 +0000 | [diff] [blame] | 1 | diff -up xserver/configure.ac.vnc xserver/configure.ac |
| 2 | --- xserver/configure.ac.vnc 2009-01-05 13:40:51.000000000 +0100 |
| 3 | +++ xserver/configure.ac 2009-01-05 13:48:18.000000000 +0100 |
| 4 | @@ -29,7 +29,6 @@ AC_PREREQ(2.57) |
| 5 | AC_INIT([xorg-server], 1.5.99.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) |
| 6 | AC_CONFIG_SRCDIR([Makefile.am]) |
| 7 | AM_INIT_AUTOMAKE([dist-bzip2 foreign]) |
| 8 | -AM_MAINTAINER_MODE |
| 9 | |
| 10 | dnl this gets generated by autoheader, and thus contains all the defines. we |
| 11 | dnl don't ever actually use it, internally. |
| 12 | @@ -50,6 +49,7 @@ dnl kdrive-config.h covers the kdrive DD |
| 13 | AC_CONFIG_HEADERS(include/kdrive-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 | @@ -1208,6 +1208,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"]) |
| Adam Tkac | e3c3e4a | 2009-01-07 17:12:00 +0000 | [diff] [blame^] | 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"]) |
| Adam Tkac | 43df913 | 2009-01-05 15:33:13 +0000 | [diff] [blame] | 27 | |
| 28 | dnl Xnest DDX |
| 29 | |
| 30 | @@ -1884,6 +1887,7 @@ hw/dmx/input/Makefile |
| 31 | hw/dmx/glxProxy/Makefile |
| 32 | hw/dmx/Makefile |
| 33 | hw/vfb/Makefile |
| 34 | +hw/vnc/Makefile |
| 35 | hw/xnest/Makefile |
| 36 | hw/xwin/Makefile |
| 37 | hw/xquartz/Makefile |
| 38 | diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am |
| 39 | --- xserver/hw/Makefile.am.vnc 2009-01-05 13:48:29.000000000 +0100 |
| 40 | +++ xserver/hw/Makefile.am 2009-01-05 13:48:42.000000000 +0100 |
| 41 | @@ -33,7 +33,8 @@ SUBDIRS = \ |
| 42 | $(XNEST_SUBDIRS) \ |
| 43 | $(DMX_SUBDIRS) \ |
| 44 | $(KDRIVE_SUBDIRS) \ |
| 45 | - $(XQUARTZ_SUBDIRS) |
| 46 | + $(XQUARTZ_SUBDIRS) \ |
| 47 | + vnc |
| 48 | |
| 49 | DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive |
| 50 | |
| 51 | diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c |
| 52 | --- xserver/mi/miinitext.c.vnc 2009-01-05 13:48:52.000000000 +0100 |
| 53 | +++ xserver/mi/miinitext.c 2009-01-05 13:51:24.000000000 +0100 |
| 54 | @@ -272,6 +272,7 @@ extern void DamageExtensionInit(INITARGS |
| 55 | extern void CompositeExtensionInit(INITARGS); |
| 56 | #endif |
| 57 | extern void GEExtensionInit(INITARGS); |
| 58 | +extern void vncExtensionInit(INITARGS); |
| 59 | |
| 60 | /* The following is only a small first step towards run-time |
| 61 | * configurable extensions. |
| 62 | @@ -477,6 +478,7 @@ InitExtensions(int argc, char *argv[]) |
| 63 | GlxPushProvider(&__glXDRISWRastProvider); |
| 64 | if (!noGlxExtension) GlxExtensionInit(); |
| 65 | #endif |
| 66 | + vncExtensionInit(); |
| 67 | } |
| 68 | |
| 69 | #else /* XFree86LOADER */ |