diff options
| author | DRC <dcommander@users.sourceforge.net> | 2011-02-10 21:33:49 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2011-02-10 21:33:49 +0000 |
| commit | 7c854510702dd9d19f1ece823b0dd4bc1ff7f294 (patch) | |
| tree | 94f0abe5afc3aa4875636eae138d31721a6a7932 /unix/xserver15.patch | |
| parent | ed1ef85063fb399c8afd97afc1da4962cd957158 (diff) | |
| download | tigervnc-7c854510702dd9d19f1ece823b0dd4bc1ff7f294.tar.gz tigervnc-7c854510702dd9d19f1ece823b0dd4bc1ff7f294.zip | |
Clean up the way build-xorg handles GnuTLS. It should now work the same way as configure, allowing GNU_CFLAGS and GNU_LDFLAGS to be overridden on the command line.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4283 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'unix/xserver15.patch')
| -rw-r--r-- | unix/xserver15.patch | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/unix/xserver15.patch b/unix/xserver15.patch index a6e4c151..7bf1454f 100644 --- a/unix/xserver15.patch +++ b/unix/xserver15.patch @@ -27,17 +27,21 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" XKB_LIB='$(top_builddir)/xkb/libxkb.la' XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' -@@ -1220,6 +1221,9 @@ if test "x$XVFB" = xyes; then +@@ -1220,6 +1221,13 @@ 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 $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_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 -@@ -1314,6 +1318,8 @@ xorg_bus_ppcpci=no +@@ -1314,6 +1322,8 @@ xorg_bus_ppcpci=no xorg_bus_sparcpci=no xorg_bus_sparc=no @@ -46,7 +50,7 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac if test "x$XORG" = xyes -o "x$XGL" = 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' -@@ -1521,7 +1527,6 @@ if test "x$XORG" = xyes -o "x$XGL" = xye +@@ -1521,7 +1531,6 @@ if test "x$XORG" = xyes -o "x$XGL" = xye AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server]) @@ -54,7 +58,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]) -@@ -2184,6 +2189,7 @@ hw/dmx/input/Makefile +@@ -2184,6 +2293,7 @@ hw/dmx/input/Makefile hw/dmx/glxProxy/Makefile hw/dmx/Makefile hw/vfb/Makefile |