Magellan Linux

Diff of /trunk/tigervnc/patches/tigervnc-1.0.90_svn4323-xserver110-patch-missing-miext_sync_ldadd.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1298 by niro, Fri Mar 4 21:05:04 2011 UTC revision 1299 by niro, Fri Mar 4 21:10:39 2011 UTC
# Line 1  Line 1 
1  --- xserver110.patch.magellan 2011-03-04 22:19:52.000000000 +0100  --- xserver110.patch.orig 2011-03-04 22:23:51.000000000 +0100
2  +++ xserver110.patch 2011-03-04 22:18:14.000000000 +0100  +++ xserver110.patch 2011-03-04 22:26:00.000000000 +0100
3  @@ -23,7 +23,7 @@  @@ -23,7 +23,7 @@
4        
5   +dnl Xvnc DDX   +dnl Xvnc DDX
6   +AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC $RANDR_INC"])   +AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC $RANDR_INC"])
7  -+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 $MIEXT_SYNC_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])  -+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"])
8  ++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"])  ++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 $MIEXT_SYNC_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
9   +   +
10   +dnl This is necessary to allow Xvnc to statically link with GnuTLS   +dnl This is necessary to allow Xvnc to statically link with GnuTLS
11   +AC_ARG_VAR(GNUTLS_LDFLAGS, [Custom linker flags for using GnuTLS, e.g. -L{GnuTLS directory}/lib -lgnutls])   +AC_ARG_VAR(GNUTLS_LDFLAGS, [Custom linker flags for using GnuTLS, e.g. -L{GnuTLS directory}/lib -lgnutls])

Legend:
Removed from v.1298  
changed lines
  Added in v.1299