From ceb45207e9cf906c54a2eab6fd802ee9c02d7f86 Mon Sep 17 00:00:00 2001 From: DRC Date: Wed, 22 Jun 2011 00:33:13 +0000 Subject: [PATCH] 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 --- unix/xserver/hw/vnc/Makefile.am | 2 +- unix/xserver110.patch | 12 ++++-------- unix/xserver15.patch | 12 ++++-------- unix/xserver16.patch | 12 ++++-------- unix/xserver17.patch | 12 ++++-------- unix/xserver18.patch | 12 ++++-------- unix/xserver19.patch | 12 ++++-------- 7 files changed, 25 insertions(+), 49 deletions(-) diff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am index 80e93e5d..0beae052 100644 --- a/unix/xserver/hw/vnc/Makefile.am +++ b/unix/xserver/hw/vnc/Makefile.am @@ -2,7 +2,7 @@ TIGERVNC_SRCDIR=${top_srcdir}/../.. LIB_DIR=${top_builddir}/../../common RFB_LIB=$(LIB_DIR)/rfb/librfb.la -RDR_LIB=$(LIB_DIR)/rdr/librdr.la $(GNUTLS_LDFLAGS) +RDR_LIB=$(LIB_DIR)/rdr/librdr.la NETWORK_LIB=$(LIB_DIR)/network/libnetwork.la XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) diff --git a/unix/xserver110.patch b/unix/xserver110.patch index 75fb7bee..0ec755a3 100644 --- a/unix/xserver110.patch +++ b/unix/xserver110.patch @@ -17,7 +17,7 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac AC_PROG_LN_S AC_LIBTOOL_WIN32_DLL AC_DISABLE_STATIC -@@ -1513,6 +1513,14 @@ if test "x$XVFB" = xyes; then +@@ -1513,6 +1513,10 @@ if test "x$XVFB" = xyes; then AC_SUBST([XVFB_SYS_LIBS]) fi @@ -25,14 +25,10 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac +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_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"]) +AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"]) -+ -+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 -@@ -1551,6 +1559,8 @@ xorg_bus_linuxpci=no +@@ -1551,6 +1555,8 @@ xorg_bus_linuxpci=no xorg_bus_bsdpci=no xorg_bus_sparc=no @@ -41,7 +37,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' -@@ -1797,7 +1807,6 @@ if test "x$XORG" = xyes; then +@@ -1797,7 +1803,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]) @@ -49,7 +45,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]) -@@ -2259,6 +2268,7 @@ hw/dmx/Makefile +@@ -2259,6 +2264,7 @@ hw/dmx/Makefile hw/dmx/man/Makefile hw/vfb/Makefile hw/vfb/man/Makefile diff --git a/unix/xserver15.patch b/unix/xserver15.patch index 63c93a5a..f9307770 100644 --- a/unix/xserver15.patch +++ b/unix/xserver15.patch @@ -27,21 +27,17 @@ 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,13 @@ if test "x$XVFB" = xyes; then +@@ -1220,6 +1221,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 $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 +1322,8 @@ xorg_bus_ppcpci=no +@@ -1314,6 +1318,8 @@ xorg_bus_ppcpci=no xorg_bus_sparcpci=no xorg_bus_sparc=no @@ -50,7 +46,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 +1531,6 @@ if test "x$XORG" = xyes -o "x$XGL" = xye +@@ -1521,7 +1527,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]) @@ -58,7 +54,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 +2193,7 @@ hw/dmx/input/Makefile +@@ -2184,6 +2189,7 @@ hw/dmx/input/Makefile hw/dmx/glxProxy/Makefile hw/dmx/Makefile hw/vfb/Makefile diff --git a/unix/xserver16.patch b/unix/xserver16.patch index ea84bf59..bbff2019 100644 --- a/unix/xserver16.patch +++ b/unix/xserver16.patch @@ -26,21 +26,17 @@ 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' -@@ -1199,6 +1199,13 @@ if test "x$XVFB" = xyes; then +@@ -1199,6 +1199,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"]) -+ -+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 -@@ -1234,6 +1241,8 @@ xorg_bus_linuxpci=no +@@ -1234,6 +1237,8 @@ xorg_bus_linuxpci=no xorg_bus_bsdpci=no xorg_bus_sparc=no @@ -49,7 +45,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' -@@ -1421,7 +1430,6 @@ if test "x$XORG" = xyes; then +@@ -1421,7 +1426,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]) @@ -57,7 +53,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]) -@@ -1875,6 +1883,7 @@ hw/dmx/input/Makefile +@@ -1875,6 +1879,7 @@ hw/dmx/input/Makefile hw/dmx/glxProxy/Makefile hw/dmx/Makefile hw/vfb/Makefile diff --git a/unix/xserver17.patch b/unix/xserver17.patch index ae99bd75..5e0ec999 100644 --- a/unix/xserver17.patch +++ b/unix/xserver17.patch @@ -17,21 +17,17 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac AM_PROG_AS AC_PROG_INSTALL AC_PROG_LN_S -@@ -1383,6 +1383,13 @@ if test "x$XVFB" = xyes; then +@@ -1383,6 +1383,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 -@@ -1421,6 +1428,8 @@ xorg_bus_linuxpci=no +@@ -1421,6 +1424,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' -@@ -1663,7 +1672,6 @@ if test "x$XORG" = xyes; then +@@ -1663,7 +1668,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]) -@@ -2108,6 +2116,7 @@ hw/dmx/input/Makefile +@@ -2108,6 +2112,7 @@ hw/dmx/input/Makefile hw/dmx/glxProxy/Makefile hw/dmx/Makefile hw/vfb/Makefile 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 diff --git a/unix/xserver19.patch b/unix/xserver19.patch index 79599d0e..4f05fcab 100644 --- a/unix/xserver19.patch +++ b/unix/xserver19.patch @@ -17,21 +17,17 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac AM_PROG_AS AC_PROG_INSTALL AC_PROG_LN_S -@@ -1514,6 +1514,13 @@ if test "x$XVFB" = xyes; then +@@ -1514,6 +1514,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 -@@ -1552,6 +1559,8 @@ xorg_bus_linuxpci=no +@@ -1552,6 +1555,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' -@@ -1798,7 +1807,6 @@ if test "x$XORG" = xyes; then +@@ -1798,7 +1803,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]) -@@ -2252,6 +2260,7 @@ hw/dmx/input/Makefile +@@ -2252,6 +2256,7 @@ hw/dmx/input/Makefile hw/dmx/glxProxy/Makefile hw/dmx/Makefile hw/vfb/Makefile -- 2.39.5