]>
Commit | Line | Data |
---|---|---|
e8befa35 JR |
1 | --- tigervnc/unix/xserver/hw/vnc/Makefile.am~ 2010-10-10 19:21:55.995628470 +0200 |
2 | +++ tigervnc/unix/xserver/hw/vnc/Makefile.am 2010-10-10 19:31:28.183628470 +0200 | |
3 | @@ -35,7 +35,7 @@ | |
4 | -I$(top_srcdir)/include -I$(includedir)/pixman-1 -I$(includedir) | |
5 | ||
6 | Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \ | |
7 | - $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lX11 | |
8 | + $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lX11 -lpthread | |
9 | ||
10 | Xvnc_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) | |
11 | ||
e1b30cbb JR |
12 | --- tigervnc-1.0.90/unix/xserver/configure.ac~ 2011-04-20 13:39:47.435047139 +0200 |
13 | +++ tigervnc-1.0.90/unix/xserver/configure.ac 2011-04-20 13:44:12.270047090 +0200 | |
14 | @@ -1422,7 +1422,7 @@ | |
15 | ||
16 | dnl Xvnc DDX | |
17 | AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC $RANDR_INC"]) | |
18 | -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"]) | |
19 | +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_SYNC_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"]) | |
20 | ||
21 | dnl This is necessary to allow Xvnc to statically link with GnuTLS | |
22 | AC_ARG_VAR(GNUTLS_LDFLAGS, [Custom linker flags for using GnuTLS, e.g. -L{GnuTLS directory}/lib -lgnutls]) | |
8fe51af0 JR |
23 | --- tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am~ 2011-04-20 13:46:16.993047050 +0200 |
24 | +++ tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am 2011-04-20 14:03:35.942724608 +0200 | |
25 | @@ -1,11 +1,12 @@ | |
26 | TIGERVNC_SRCDIR=${top_srcdir}/../.. | |
27 | LIB_DIR=${top_builddir}/../../common | |
28 | ||
29 | +OS_LIB=$(LIB_DIR)/os/libos.la | |
30 | RFB_LIB=$(LIB_DIR)/rfb/librfb.la | |
31 | RDR_LIB=$(LIB_DIR)/rdr/librdr.la $(GNUTLS_LDFLAGS) | |
32 | NETWORK_LIB=$(LIB_DIR)/network/libnetwork.la | |
33 | XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la | |
34 | -COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) | |
35 | +COMMON_LIBS=$(NETWORK_LIB) $(OS_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) | |
36 | ||
37 | noinst_LTLIBRARIES = libvnccommon.la | |
38 |