diff options
| author | Adam Tkac <atkac@redhat.com> | 2009-12-21 14:02:14 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@redhat.com> | 2009-12-21 14:02:14 +0000 |
| commit | 9e926ebe56deb2a0770c71353518b5ecc6d5f8d9 (patch) | |
| tree | 328fb2681fef6b722632ba8339c649529fba839c | |
| parent | 735d56ce9b000ea728eda8d12b01bc59ee342f4e (diff) | |
| download | tigervnc-9e926ebe56deb2a0770c71353518b5ecc6d5f8d9.tar.gz tigervnc-9e926ebe56deb2a0770c71353518b5ecc6d5f8d9.zip | |
[Development] Link libvnc.so against libdix, libXi and libxkb.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3928 3789f03b-4d11-0410-bbf8-ca57d06f2519
| -rw-r--r-- | unix/xserver/hw/vnc/Makefile.am | 2 | ||||
| -rw-r--r-- | unix/xserver17.patch | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am index 223fe53d..5845f1ee 100644 --- a/unix/xserver/hw/vnc/Makefile.am +++ b/unix/xserver/hw/vnc/Makefile.am @@ -52,7 +52,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I$(LIB_DIR) -UHAVE_CONFIG_H \ libvnc_la_LDFLAGS = -module -avoid-version -libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) +libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(LIBVNC_LIBS) EXTRA_DIST = Xvnc.man diff --git a/unix/xserver17.patch b/unix/xserver17.patch index 36c96ec7..ac240a38 100644 --- a/unix/xserver17.patch +++ b/unix/xserver17.patch @@ -16,13 +16,14 @@ AM_PROG_AS AC_PROG_INSTALL AC_PROG_LN_S -@@ -1383,6 +1383,9 @@ if test "x$XVFB" = xyes; then +@@ -1383,6 +1383,10 @@ 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"]) ++AC_SUBST([LIBVNC_LIBS], ["$XI_LIB $DIX_LIB $XKB_LIB"]) dnl Xnest DDX |