diff options
| author | DRC <dcommander@users.sourceforge.net> | 2011-06-22 00:33:13 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2011-06-22 00:33:13 +0000 |
| commit | ceb45207e9cf906c54a2eab6fd802ee9c02d7f86 (patch) | |
| tree | eb97dd2d6772fe6b909b983db5487daac1b3e0e4 /unix/xserver18.patch | |
| parent | 777290b4692c45f4854f9c917da18783c98010a0 (diff) | |
| download | tigervnc-ceb45207e9cf906c54a2eab6fd802ee9c02d7f86.tar.gz tigervnc-ceb45207e9cf906c54a2eab6fd802ee9c02d7f86.zip | |
No longer need to explicitly specify GNUTLS_LDFLAGS in X server build, since the librfb.la file now includes the GnuTLS dependencies.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4514 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'unix/xserver18.patch')
| -rw-r--r-- | unix/xserver18.patch | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/unix/xserver18.patch b/unix/xserver18.patch index 77cf97cf..9f153a91 100644 --- a/unix/xserver18.patch +++ b/unix/xserver18.patch @@ -17,21 +17,17 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac AM_PROG_AS AC_PROG_INSTALL AC_PROG_LN_S -@@ -1505,6 +1505,13 @@ if test "x$XVFB" = xyes; then +@@ -1505,6 +1505,9 @@ 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_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"]) -+ -+dnl This is necessary to allow Xvnc to statically link with GnuTLS -+AC_ARG_VAR(GNUTLS_LDFLAGS, [Custom linker flags for using GnuTLS, e.g. -L{GnuTLS directory}/lib -lgnutls]) -+AC_SUBST(GNUTLS_LDFLAGS) dnl Xnest DDX -@@ -1543,6 +1550,8 @@ xorg_bus_linuxpci=no +@@ -1543,6 +1546,8 @@ xorg_bus_linuxpci=no xorg_bus_bsdpci=no xorg_bus_sparc=no @@ -40,7 +36,7 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac 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' -@@ -1787,7 +1796,6 @@ if test "x$XORG" = xyes; then +@@ -1787,7 +1792,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]) @@ -48,7 +44,7 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac 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]) -@@ -2231,6 +2239,7 @@ hw/dmx/input/Makefile +@@ -2231,6 +2235,7 @@ hw/dmx/input/Makefile hw/dmx/glxProxy/Makefile hw/dmx/Makefile hw/vfb/Makefile |