|
Adam Tkac |
dd82383 |
diff -up xserver/configure.ac.vnc xserver/configure.ac
|
|
 |
58c0bdb |
--- xserver/configure.ac.vnc 2012-07-19 20:22:21.774770804 -0400
|
|
|
58c0bdb |
+++ xserver/configure.ac 2012-07-19 20:24:42.293014083 -0400
|
|
|
58c0bdb |
@@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.12.99.902, [htt
|
|
|
58c0bdb |
RELEASE_DATE="2012-07-17"
|
|
Adam Tkac |
dd82383 |
AC_CONFIG_SRCDIR([Makefile.am])
|
|
Adam Tkac |
dd82383 |
AM_INIT_AUTOMAKE([foreign dist-bzip2])
|
|
Adam Tkac |
dd82383 |
-AM_MAINTAINER_MODE
|
|
Adam Tkac |
dd82383 |
|
|
|
58c0bdb |
# Require xorg-macros minimum of 1.14 for XORG_COMPILER_BRAND in XORG_DEFAULT_OPTIONS
|
|
Adam Tkac |
dd82383 |
m4_ifndef([XORG_MACROS_VERSION],
|
|
|
58c0bdb |
@@ -72,6 +71,7 @@ dnl forcing an entire recompile.x
|
|
Adam Tkac |
dd82383 |
AC_CONFIG_HEADERS(include/version-config.h)
|
|
Adam Tkac |
dd82383 |
|
|
Adam Tkac |
dd82383 |
AM_PROG_AS
|
|
Adam Tkac |
dd82383 |
+AC_PROG_CXX
|
|
Adam Tkac |
dd82383 |
AC_PROG_LN_S
|
|
Adam Tkac |
dd82383 |
AC_LIBTOOL_WIN32_DLL
|
|
Adam Tkac |
dd82383 |
AC_DISABLE_STATIC
|
|
|
58c0bdb |
@@ -1560,6 +1560,14 @@ if test "x$XVFB" = xyes; then
|
|
Adam Tkac |
dd82383 |
AC_SUBST([XVFB_SYS_LIBS])
|
|
Adam Tkac |
dd82383 |
fi
|
|
Adam Tkac |
dd82383 |
|
|
Adam Tkac |
dd82383 |
+dnl Xvnc DDX
|
|
|
58c0bdb |
+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC $RANDR_INC $MIEXT_DAMAGE_INC"])
|
|
Adam Tkac |
dd82383 |
+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"])
|
|
Adam Tkac |
dd82383 |
+AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"])
|
|
Adam Tkac |
dd82383 |
+
|
|
Adam Tkac |
dd82383 |
+dnl This is necessary to allow Xvnc to statically link with GnuTLS
|
|
Adam Tkac |
dd82383 |
+AC_ARG_VAR(GNUTLS_LDFLAGS, [Custom linker flags for using GnuTLS, e.g. -L{GnuTLS directory}/lib -lgnutls])
|
|
Adam Tkac |
dd82383 |
+AC_SUBST(GNUTLS_LDFLAGS)
|
|
Adam Tkac |
dd82383 |
|
|
Adam Tkac |
dd82383 |
dnl Xnest DDX
|
|
Adam Tkac |
dd82383 |
|
|
|
58c0bdb |
@@ -1595,6 +1603,8 @@ if test "x$XORG" = xauto; then
|
|
|
58c0bdb |
fi
|
|
|
58c0bdb |
AC_MSG_RESULT([$XORG])
|
|
Adam Tkac |
dd82383 |
|
|
Adam Tkac |
dd82383 |
+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
|
|
Adam Tkac |
dd82383 |
+
|
|
Adam Tkac |
dd82383 |
if test "x$XORG" = xyes; then
|
|
Adam Tkac |
dd82383 |
XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
|
|
Adam Tkac |
dd82383 |
XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
|
|
|
58c0bdb |
@@ -1813,7 +1823,6 @@ if test "x$XORG" = xyes; then
|
|
|
58c0bdb |
AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
|
|
Adam Tkac |
dd82383 |
AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
|
|
Adam Tkac |
dd82383 |
AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
|
|
Adam Tkac |
dd82383 |
- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
|
|
Adam Tkac |
dd82383 |
AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
|
|
Adam Tkac |
dd82383 |
AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
|
|
Adam Tkac |
dd82383 |
AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
|
|
|
58c0bdb |
@@ -2279,6 +2288,7 @@ hw/dmx/Makefile
|
|
Adam Tkac |
dd82383 |
hw/dmx/man/Makefile
|
|
Adam Tkac |
dd82383 |
hw/vfb/Makefile
|
|
Adam Tkac |
dd82383 |
hw/vfb/man/Makefile
|
|
Adam Tkac |
dd82383 |
+hw/vnc/Makefile
|
|
Adam Tkac |
dd82383 |
hw/xnest/Makefile
|
|
Adam Tkac |
dd82383 |
hw/xnest/man/Makefile
|
|
Adam Tkac |
dd82383 |
hw/xwin/Makefile
|
|
Adam Tkac |
dd82383 |
diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am
|
|
|
58c0bdb |
--- xserver/hw/Makefile.am.vnc 2012-07-19 20:22:28.575685781 -0400
|
|
|
58c0bdb |
+++ xserver/hw/Makefile.am 2012-07-19 20:22:31.483649426 -0400
|
|
Adam Tkac |
dd82383 |
@@ -33,7 +33,8 @@ SUBDIRS = \
|
|
Adam Tkac |
dd82383 |
$(XNEST_SUBDIRS) \
|
|
Adam Tkac |
dd82383 |
$(DMX_SUBDIRS) \
|
|
Adam Tkac |
dd82383 |
$(KDRIVE_SUBDIRS) \
|
|
Adam Tkac |
dd82383 |
- $(XQUARTZ_SUBDIRS)
|
|
Adam Tkac |
dd82383 |
+ $(XQUARTZ_SUBDIRS) \
|
|
Adam Tkac |
dd82383 |
+ vnc
|
|
Adam Tkac |
dd82383 |
|
|
Adam Tkac |
dd82383 |
DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive
|
|
Adam Tkac |
dd82383 |
|
|
|
58c0bdb |
diff -up xserver/include/extinit.h.vnc xserver/include/extinit.h
|
|
|
58c0bdb |
--- xserver/include/extinit.h.vnc 2012-07-19 20:25:50.465161815 -0400
|
|
|
58c0bdb |
+++ xserver/include/extinit.h 2012-07-19 20:25:52.490136499 -0400
|
|
|
58c0bdb |
@@ -81,6 +81,8 @@ extern void DPMSExtensionInit(void);
|
|
|
58c0bdb |
extern Bool noGEExtension;
|
|
|
58c0bdb |
extern void GEExtensionInit(void);
|
|
|
58c0bdb |
|
|
|
58c0bdb |
+extern void vncExtensionInit(void);
|
|
|
58c0bdb |
+
|
|
|
58c0bdb |
#ifdef GLXEXT
|
|
|
58c0bdb |
extern _X_EXPORT Bool noGlxExtension;
|
|
|
58c0bdb |
extern void GlxExtensionInit(void);
|
|
Adam Tkac |
dd82383 |
diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c
|
|
|
58c0bdb |
--- xserver/mi/miinitext.c.vnc 2012-07-19 20:22:30.000000000 -0400
|
|
|
58c0bdb |
+++ xserver/mi/miinitext.c 2012-07-19 20:26:48.560435524 -0400
|
|
|
58c0bdb |
@@ -293,6 +293,7 @@ static ExtensionModule staticExtensions[
|
|
|
58c0bdb |
#ifdef XSELINUX
|
|
|
58c0bdb |
{SELinuxExtensionInit, SELINUX_EXTENSION_NAME, &noSELinuxExtension},
|
|
Adam Tkac |
dd82383 |
#endif
|
|
|
58c0bdb |
+ {vncExtensionInit, "VNC", NULL},
|
|
|
58c0bdb |
};
|
|
Adam Tkac |
dd82383 |
|
|
|
58c0bdb |
static ExtensionModule *ExtensionModuleList = NULL;
|