[gnome-commander] Added gnome-keyring dependency

[Piotr Eljasiak <epiotr src gnome org>]

commit 7edb865dfd3fca3c00e359f1faa83e47ed95fb36
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Mon Sep 12 19:39:40 2011 +0200

    Added gnome-keyring dependency

 README.in                    |    3 ++-
 configure.in                 |   11 +++++++++++
 data/gnome-commander.spec.in |    5 +++++
 src/Makefile.am              |    2 ++
 4 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/README.in b/README.in
index 4b244f4..cf17d24 100644
--- a/README.in
+++ b/README.in
@@ -67,7 +67,8 @@ Plugins:
 3. Building
 --------------------------------
 
-GNOME Commander requires glib >= @GLIB_REQ@, GTK+ >= @GTK_REQ@, gnome >= @GNOMEUI_REQ@ and unique >= @UNIQUE_REQ@ libraries.
+GNOME Commander requires glib >= @GLIB_REQ@, GTK+ >= @GTK_REQ@, gnome >= @GNOMEUI_REQ@, 
+gnome-keyring >= @GNOME_KEYRING_REQ@ and unique >= @UNIQUE_REQ@ libraries.
 
 Additionally GNOME Commander may require:
 
diff --git a/configure.in b/configure.in
index a18b2d1..07fb4ec 100644
--- a/configure.in
+++ b/configure.in
@@ -47,6 +47,7 @@ GTK_REQ=2.8.0
 GNOME_REQ=2.0.0
 GNOMEUI_REQ=2.4.0
 GNOMEVFS_REQ=2.0.0
+GNOME_KEYRING_REQ=2.0
 UNIQUE_REQ=0.9.3
 PYTHON_REQ=2.5
 EXIV2_REQ=0.14
@@ -59,6 +60,7 @@ AC_SUBST(GTK_REQ)
 AC_SUBST(GNOME_REQ)
 AC_SUBST(GNOMEUI_REQ)
 AC_SUBST(GNOMEVFS_REQ)
+AC_SUBST(GNOME_KEYRING_REQ)
 AC_SUBST(UNIQUE_REQ)
 AC_SUBST(PYTHON_REQ)
 AC_SUBST(EXIV2_REQ)
@@ -193,6 +195,14 @@ else
 fi
 
 
+dnl Check for gnome-keyring
+PKG_CHECK_MODULES(GNOME_KEYRING, [ gnome-keyring-1 >= ${GNOME_KEYRING_REQ} ])
+GNOME_KEYRING_PREFIX=`pkg-config --variable=prefix gnome-keyring-1`
+GNOME_KEYRING_VERSION=`pkg-config --modversion gnome-keyring-1`
+AC_SUBST([GNOME_KEYRING_PREFIX])
+AC_SUBST([GNOME_KEYRING_VERSION])
+
+
 dnl Check for libUnique
 PKG_CHECK_MODULES(UNIQUE, [ unique-1.0 >= ${UNIQUE_REQ} ])
 UNIQUE_PREFIX=`pkg-config --variable=prefix unique-1.0`
@@ -447,6 +457,7 @@ echo "  gtk+           : ${GTK_VERSION}	in ${GTK_PREFIX}"
 echo "  gnome          : ${GNOME_VERSION}	in ${GNOME_PREFIX}"
 echo "  gnomeui        : ${GNOMEUI_VERSION}	in ${GNOMEUI_PREFIX}"
 echo "  gnome-vfs      : ${GNOMEVFS_VERSION}	in ${GNOMEVFS_PREFIX}"
+echo "  gnome-keyring  : ${GNOME_KEYRING_VERSION}	in ${GNOME_KEYRING_PREFIX}"
 echo "  libUnique      : ${UNIQUE_VERSION}	in ${UNIQUE_PREFIX}"
 if test "x$have_python" = "xyes"; then
 echo "  python         : ${PYTHON_VERSION}  	in ${PY_EXEC_PREFIX}"
diff --git a/data/gnome-commander.spec.in b/data/gnome-commander.spec.in
index ec84068..2f39b12 100644
--- a/data/gnome-commander.spec.in
+++ b/data/gnome-commander.spec.in
@@ -46,6 +46,7 @@ BuildRequires: glib2-devel >= @GLIB_REQ@
 BuildRequires: gtk2-devel >= @GTK_REQ@
 BuildRequires: gnome-vfs2-devel >= @GNOMEVFS_REQ@
 BuildRequires: libgnomeui-devel >= @GNOMEUI_REQ@
+BuildRequires: gnome-keyring-devel >= @GNOME_KEYRING_REQ@
 BuildRequires: unique-devel >= @UNIQUE_REQ@
 BuildRequires: gnome-doc-utils >= 0.3.2
 BuildRequires: perl(XML::Parser)
@@ -55,6 +56,7 @@ Requires:      gtk2 >= @GTK_REQ@
 Requires:      gnome-vfs2 >= @GNOMEVFS_REQ@
 Requires:      gnome-vfs2-smb >= @GNOMEVFS_REQ@
 Requires:      libgnomeui >= @GNOMEUI_REQ@
+Requires:      gnome-keyring >= @GNOME_KEYRING_REQ@
 Requires:      unique >= @UNIQUE_REQ@
 
 Requires:         findutils, grep
@@ -165,6 +167,9 @@ scrollkeeper-update -q || :
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Mon Sep 12 2011 Piotr Eljasiak <epiotr use pl>
+- added gnome-keyring dependency
+
 * Mon May 23 2011 Piotr Eljasiak <epiotr use pl>
 - added findutils and grep dependencies
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 0fa5730..6a401c2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	$(GNOMEUI_CFLAGS) \
 	$(GNOMEVFS_CFLAGS) \
+	$(GNOME_KEYRING_CFLAGS) \
 	$(UNIQUE_CFLAGS) \
 	$(PYTHON_CFLAGS) \
 	-DDATADIR=\""$(datadir)"\"\
@@ -103,6 +104,7 @@ gnome_commander_LDADD = \
 	intviewer/libgviewer.a \
 	$(GNOMEUI_LIBS) \
 	$(GNOMEVFS_LIBS) \
+	$(GNOME_KEYRING_LIBS) \
 	$(UNIQUE_LIBS) \
 	$(EXIV2_LIBS) \
 	$(TAGLIB_LIBS) \