[gnote] Add gnome-keyring dependency



commit a51e9db891f4704bf41c3fff574d9e5b69857b5b
Author: Aurimas Äernius <aurisc4 gmail com>
Date:   Sun Jun 17 20:09:55 2012 +0300

    Add gnome-keyring dependency
    
    Add required check to configure.ac and makefile modifications
    to link against libgnome-keyring.

 configure.ac            |    4 ++++
 src/Makefile.am         |    4 +++-
 src/addins/addins.mk.in |    1 +
 3 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1895620..81a760f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,7 @@ LIBGTKMM_VERSION=3.0
 LIBPANELAPPLET_VERSION=3.0
 GTKSPELL_VERSION=2.0.9
 BOOST_VERSION=1.34
+GNOME_KEYRING_VERSION=3.0
 
 AC_PROG_CXX
 AC_GNU_SOURCE
@@ -114,6 +115,9 @@ AC_SUBST(GTKSPELL_LIBS)
 AM_CONDITIONAL(FIXED_GTKSPELL, test "$FIXED_GTKSPELL" = "yes")
 
 
+PKG_CHECK_MODULES(GNOME_KEYRING, [gnome-keyring-1 >= $GNOME_KEYRING_VERSION])
+
+
 
 BOOST_REQUIRE([$BOOST_VERSION])
 BOOST_BIND
diff --git a/src/Makefile.am b/src/Makefile.am
index ce0aafb..1237c5e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,6 +11,7 @@ AM_CPPFLAGS= LIBGTKMM_CFLAGS@ @LIBGLIBMM_CFLAGS@ \
 	@LIBXSLT_CFLAGS@ \
 	@PCRE_CFLAGS@ \
 	@UUID_CFLAGS@ \
+	@GNOME_KEYRING_CFLAGS@ \
 	-DGNOTE_LOCALEDIR=\"@GNOTE_LOCALEDIR \" \
 	-DDATADIR=\"$(datadir)\" -DLIBDIR=\"$(libdir)\"
 
@@ -21,7 +22,8 @@ LIBGNOTE_LIBS = $(top_builddir)/libtomboy/libtomboy.la \
 	@LIBXSLT_LIBS@ \
 	@PCRE_LIBS@ \
 	@GTKSPELL_LIBS@ @GTK_LIBS@ \
-	@UUID_LIBS@
+	@UUID_LIBS@ \
+	@GNOME_KEYRING_LIBS@
 GNOTE_LIBS = libgnote.la $(LIBGNOTE_LIBS)
 
 lib_LTLIBRARIES = libgnote.la
diff --git a/src/addins/addins.mk.in b/src/addins/addins.mk.in
index 9c514fa..b6ec513 100644
--- a/src/addins/addins.mk.in
+++ b/src/addins/addins.mk.in
@@ -5,6 +5,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
 
 AM_CPPFLAGS= LIBGTKMM_CFLAGS@ @LIBGLIBMM_CFLAGS@ \
 	@LIBXML_CFLAGS@ \
+	@GNOME_KEYRING_CFLAGS@ \
 	-DDATADIR=\"$(datadir)\" -DLIBDIR=\"$(libdir)\"
 
 AM_LDFLAGS = -avoid-version -module -export-dynamic



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]