Adam Tkac | 408e6f6 | 2010-12-08 16:10:47 +0000 | [diff] [blame] | 1 | diff -up xserver/configure.ac.vnc xserver/configure.ac |
Adam Tkac | 37d60d8 | 2011-04-27 13:26:36 +0000 | [diff] [blame^] | 2 | --- xserver/configure.ac.vnc 2011-03-22 10:41:05.508614018 +0100 |
| 3 | +++ xserver/configure.ac 2011-03-22 10:47:01.592023995 +0100 |
Adam Tkac | c583c04 | 2011-03-14 13:00:43 +0000 | [diff] [blame] | 4 | @@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.10.0, [https:// |
| 5 | RELEASE_DATE="2011-2-25" |
Adam Tkac | 408e6f6 | 2010-12-08 16:10:47 +0000 | [diff] [blame] | 6 | AC_CONFIG_SRCDIR([Makefile.am]) |
| 7 | AM_INIT_AUTOMAKE([foreign dist-bzip2]) |
| 8 | -AM_MAINTAINER_MODE |
| 9 | |
| 10 | # Require xorg-macros minimum of 1.10 for XORG_CHECK_SGML_DOCTOOLS |
| 11 | m4_ifndef([XORG_MACROS_VERSION], |
| 12 | @@ -65,6 +64,7 @@ dnl forcing an entire recompile.x |
| 13 | AC_CONFIG_HEADERS(include/version-config.h) |
| 14 | |
Adam Tkac | 408e6f6 | 2010-12-08 16:10:47 +0000 | [diff] [blame] | 15 | AM_PROG_AS |
Adam Tkac | c583c04 | 2011-03-14 13:00:43 +0000 | [diff] [blame] | 16 | +AC_PROG_CXX |
Adam Tkac | 408e6f6 | 2010-12-08 16:10:47 +0000 | [diff] [blame] | 17 | AC_PROG_LN_S |
Adam Tkac | c583c04 | 2011-03-14 13:00:43 +0000 | [diff] [blame] | 18 | AC_LIBTOOL_WIN32_DLL |
| 19 | AC_DISABLE_STATIC |
Adam Tkac | 37d60d8 | 2011-04-27 13:26:36 +0000 | [diff] [blame^] | 20 | @@ -1510,6 +1510,14 @@ if test "x$XVFB" = xyes; then |
Adam Tkac | 408e6f6 | 2010-12-08 16:10:47 +0000 | [diff] [blame] | 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"]) |
Adam Tkac | 37d60d8 | 2011-04-27 13:26:36 +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_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"]) |
| 27 | +AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"]) |
DRC | 7c85451 | 2011-02-10 21:33:49 +0000 | [diff] [blame] | 28 | + |
| 29 | +dnl This is necessary to allow Xvnc to statically link with GnuTLS |
| 30 | +AC_ARG_VAR(GNUTLS_LDFLAGS, [Custom linker flags for using GnuTLS, e.g. -L{GnuTLS directory}/lib -lgnutls]) |
| 31 | +AC_SUBST(GNUTLS_LDFLAGS) |
Adam Tkac | 408e6f6 | 2010-12-08 16:10:47 +0000 | [diff] [blame] | 32 | |
| 33 | dnl Xnest DDX |
| 34 | |
Adam Tkac | 37d60d8 | 2011-04-27 13:26:36 +0000 | [diff] [blame^] | 35 | @@ -1548,6 +1556,8 @@ xorg_bus_linuxpci=no |
Adam Tkac | 408e6f6 | 2010-12-08 16:10:47 +0000 | [diff] [blame] | 36 | xorg_bus_bsdpci=no |
| 37 | xorg_bus_sparc=no |
| 38 | |
| 39 | +AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) |
| 40 | + |
| 41 | if test "x$XORG" = xyes; then |
| 42 | XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' |
| 43 | XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' |
Adam Tkac | 37d60d8 | 2011-04-27 13:26:36 +0000 | [diff] [blame^] | 44 | @@ -1792,7 +1802,6 @@ if test "x$XORG" = xyes; then |
Adam Tkac | 408e6f6 | 2010-12-08 16:10:47 +0000 | [diff] [blame] | 45 | AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) |
| 46 | AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) |
| 47 | AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server]) |
| 48 | - AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) |
| 49 | AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) |
| 50 | AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) |
| 51 | AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) |
Adam Tkac | 37d60d8 | 2011-04-27 13:26:36 +0000 | [diff] [blame^] | 52 | @@ -2254,6 +2263,7 @@ hw/dmx/Makefile |
Adam Tkac | c583c04 | 2011-03-14 13:00:43 +0000 | [diff] [blame] | 53 | hw/dmx/man/Makefile |
Adam Tkac | 408e6f6 | 2010-12-08 16:10:47 +0000 | [diff] [blame] | 54 | hw/vfb/Makefile |
Adam Tkac | c583c04 | 2011-03-14 13:00:43 +0000 | [diff] [blame] | 55 | hw/vfb/man/Makefile |
Adam Tkac | 408e6f6 | 2010-12-08 16:10:47 +0000 | [diff] [blame] | 56 | +hw/vnc/Makefile |
| 57 | hw/xnest/Makefile |
Adam Tkac | c583c04 | 2011-03-14 13:00:43 +0000 | [diff] [blame] | 58 | hw/xnest/man/Makefile |
Adam Tkac | 408e6f6 | 2010-12-08 16:10:47 +0000 | [diff] [blame] | 59 | hw/xwin/Makefile |
Adam Tkac | 408e6f6 | 2010-12-08 16:10:47 +0000 | [diff] [blame] | 60 | diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am |
Adam Tkac | 37d60d8 | 2011-04-27 13:26:36 +0000 | [diff] [blame^] | 61 | --- xserver/hw/Makefile.am.vnc 2011-03-22 10:41:05.528613984 +0100 |
| 62 | +++ xserver/hw/Makefile.am 2011-03-22 10:41:05.630613813 +0100 |
Adam Tkac | 408e6f6 | 2010-12-08 16:10:47 +0000 | [diff] [blame] | 63 | @@ -33,7 +33,8 @@ SUBDIRS = \ |
| 64 | $(XNEST_SUBDIRS) \ |
| 65 | $(DMX_SUBDIRS) \ |
| 66 | $(KDRIVE_SUBDIRS) \ |
| 67 | - $(XQUARTZ_SUBDIRS) |
| 68 | + $(XQUARTZ_SUBDIRS) \ |
| 69 | + vnc |
| 70 | |
| 71 | DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive |
| 72 | |
| 73 | diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c |
Adam Tkac | 37d60d8 | 2011-04-27 13:26:36 +0000 | [diff] [blame^] | 74 | --- xserver/mi/miinitext.c.vnc 2011-03-22 10:41:05.591613878 +0100 |
| 75 | +++ xserver/mi/miinitext.c 2011-03-22 10:41:05.630613813 +0100 |
Adam Tkac | 408e6f6 | 2010-12-08 16:10:47 +0000 | [diff] [blame] | 76 | @@ -263,6 +263,7 @@ extern void DamageExtensionInit(INITARGS |
| 77 | extern void CompositeExtensionInit(INITARGS); |
| 78 | #endif |
| 79 | extern void GEExtensionInit(INITARGS); |
| 80 | +extern void vncExtensionInit(INITARGS); |
| 81 | |
| 82 | /* The following is only a small first step towards run-time |
| 83 | * configurable extensions. |
Adam Tkac | c583c04 | 2011-03-14 13:00:43 +0000 | [diff] [blame] | 84 | @@ -433,6 +434,7 @@ InitExtensions(int argc, char *argv[]) |
Adam Tkac | 408e6f6 | 2010-12-08 16:10:47 +0000 | [diff] [blame] | 85 | #ifdef XF86BIGFONT |
| 86 | if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit(); |
| 87 | #endif |
| 88 | + vncExtensionInit(); |
| 89 | #if !defined(NO_HW_ONLY_EXTS) |
| 90 | #if defined(XF86VIDMODE) |
| 91 | if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit(); |