[vinagre/gnome-3-0] Fix the SSH plugin build, bug 647497
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vinagre/gnome-3-0] Fix the SSH plugin build, bug 647497
- Date: Mon, 11 Apr 2011 21:41:44 +0000 (UTC)
commit 27c4bc5b08ef90a8c25792f9786258719f3847cc
Author: Dominique Leuenberger <dimstar opensuse org>
Date: Mon Apr 11 22:09:47 2011 +0200
Fix the SSH plugin build, bug 647497
Add LIBADD for ssh plugin, and use $(VINAGRE_LIBS) for it. Add $SSH_DEPS
to VINAGRE pkg-config check.
Makefile.am | 1 +
configure.ac | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 2794c0f..d10a152 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -249,6 +249,7 @@ libssh_la_SOURCES = \
plugins/ssh/vinagre-ssh-tab.c
libssh_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+libssh_la_LIBADD = $(VINAGRE_LIBS)
endif
plugin_LTLIBRARIES = \
diff --git a/configure.ac b/configure.ac
index a169d22..7420fdb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -193,7 +193,7 @@ AS_IF([test "x$have_panelapplet" = "xyes"],
AM_CONDITIONAL([VINAGRE_HAVE_PANELAPPLET], [test "x$have_panelapplet" = "xyes"])
# Check required libraries
-PKG_CHECK_MODULES([VINAGRE], [$GLIB_DEPS $GTHREAD_DEPS $GTK_DEPS gnome-keyring-1 $XML2_DEPS $PEAS_DEPS $AVAHI_DEPS $TELEPATHY_GLIB_DEPS])
+PKG_CHECK_MODULES([VINAGRE], [$GLIB_DEPS $GTHREAD_DEPS $GTK_DEPS gnome-keyring-1 $XML2_DEPS $PEAS_DEPS $AVAHI_DEPS $TELEPATHY_GLIB_DEPS $SSH_DEPS])
PKG_CHECK_MODULES([VNC], [$GTK_VNC_DEPS $GTK_DEPS $XML2_DEPS])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]