[f-spot] Remove embedded gnome-keyring-sharp.

[Ruben Vermeersch <rubenv src gnome org>]

commit bc8085fe0041159a0eb496f9cb26654b2f3195ec
Author: Ruben Vermeersch <ruben savanne be>
Date:   Sat May 15 00:18:57 2010 +0200

    Remove embedded gnome-keyring-sharp.
    
    From now on we're depending on the distribution copy, as most
    distributions have it. Furthermore, Iain Laney pointed out that the
    embedded version was broken anyway.

 Makefile.include                            |    3 +-
 autogen.sh                                  |    2 +-
 build/m4/f-spot/gnome-keyring-sharp.m4      |    8 +
 configure.ac                                |    5 +-
 f-spot.csproj                               |   17 -
 lib/Makefile.am                             |    1 -
 lib/gnome-keyring-sharp/.gitignore          |    4 -
 lib/gnome-keyring-sharp/AccessRights.cs     |   39 --
 lib/gnome-keyring-sharp/AssemblyInfo.cs     |   36 --
 lib/gnome-keyring-sharp/AttributeType.cs    |   36 --
 lib/gnome-keyring-sharp/GenericItemData.cs  |   50 ---
 lib/gnome-keyring-sharp/ItemACL.cs          |   63 ---
 lib/gnome-keyring-sharp/ItemData.cs         |   70 ----
 lib/gnome-keyring-sharp/ItemType.cs         |   37 --
 lib/gnome-keyring-sharp/KeyringException.cs |   89 -----
 lib/gnome-keyring-sharp/KeyringInfo.cs      |  106 ------
 lib/gnome-keyring-sharp/Makefile.am         |   41 --
 lib/gnome-keyring-sharp/NetItemData.cs      |   65 ----
 lib/gnome-keyring-sharp/NoteItemData.cs     |   39 --
 lib/gnome-keyring-sharp/Operation.cs        |   54 ---
 lib/gnome-keyring-sharp/RequestMessage.cs   |  173 ---------
 lib/gnome-keyring-sharp/ResponseMessage.cs  |  108 ------
 lib/gnome-keyring-sharp/ResultCode.cs       |   43 ---
 lib/gnome-keyring-sharp/Ring.cs             |  539 ---------------------------
 src/f-spot.in                               |    2 +-
 25 files changed, 13 insertions(+), 1617 deletions(-)
---
diff --git a/Makefile.include b/Makefile.include
index 4e0ec9a..30b8ac6 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -8,7 +8,6 @@ DIR_EXTENSIONS = $(top_builddir)/extensions
 DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
 DIR_ICONS = $(top_builddir)/icons
 DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
-DIR_KEYRING = $(top_builddir)/lib/gnome-keyring-sharp
 DIR_LIBFSPOT = $(top_builddir)/lib/libfspot
 DIR_SEMWEB = $(top_builddir)/lib/semweb
 DIR_SRC = $(top_builddir)/src
@@ -18,7 +17,7 @@ DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
 
 ## Links
 
-LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+LINK_KEYRING = $(KEYRINGSHARP_LIBS)
 LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
diff --git a/autogen.sh b/autogen.sh
index 8a22b00..080cb89 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -67,7 +67,7 @@ check_autotool_version gnome-doc-prepare 0.17.0
 
 run intltoolize --force --copy
 run $LIBTOOLIZE --force --copy --automake
-run aclocal -I build/m4/shamrock -I build/m4/shave $ACLOCAL_FLAGS
+run aclocal -I build/m4/f-spot -I build/m4/shamrock -I build/m4/shave $ACLOCAL_FLAGS
 run autoconf
 run autoheader
 run gnome-doc-prepare
diff --git a/build/m4/f-spot/gnome-keyring-sharp.m4 b/build/m4/f-spot/gnome-keyring-sharp.m4
new file mode 100644
index 0000000..501314f
--- /dev/null
+++ b/build/m4/f-spot/gnome-keyring-sharp.m4
@@ -0,0 +1,8 @@
+AC_DEFUN([FSPOT_CHECK_GNOME_KEYRING_SHARP],
+[
+	GNOMEKEYRINGSHARP_REQUIRED=1.0
+
+	PKG_CHECK_MODULES(KEYRINGSHARP,
+		gnome-keyring-sharp-1.0 >= $GNOMEKEYRINGSHARP_REQUIRED)
+	AC_SUBST(KEYRINGSHARP_LIBS)
+])
diff --git a/configure.ac b/configure.ac
index a24ad1d..b8abc48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,7 @@ AC_INIT([f-spot], fspot_version,
 AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar dist-zip foreign])
 AM_MAINTAINER_MODE
 AM_CONFIG_HEADER(config.h)
-AC_SUBST([ACLOCAL_AMFLAGS], ["-I build/m4/shamrock -I build/m4/shave \${ACLOCAL_FLAGS}"])
+AC_SUBST([ACLOCAL_AMFLAGS], ["-I build/m4/f-spot -I build/m4/shamrock -I build/m4/shave \${ACLOCAL_FLAGS}"])
 
 IT_PROG_INTLTOOL([0.35.0])
 AC_PROG_LIBTOOL
@@ -72,7 +72,7 @@ SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([
     Mono.Cairo
 ])
 
-
+FSPOT_CHECK_GNOME_KEYRING_SHARP
 
 
 
@@ -344,7 +344,6 @@ lib/GKeyFile/Makefile
 lib/gio-sharp/Makefile
 lib/gio-sharp/gio/Makefile
 lib/gio-sharp/generator/Makefile
-lib/gnome-keyring-sharp/Makefile
 lib/gtk-sharp-beans/Makefile
 lib/libfspot/Makefile
 lib/libgphoto2-sharp/Makefile
diff --git a/f-spot.csproj b/f-spot.csproj
index 0b75537..9eabdbd 100644
--- a/f-spot.csproj
+++ b/f-spot.csproj
@@ -710,22 +710,6 @@
     <Compile Include="lib\gio-sharp\gio\generated\VolumeChangedHandler.cs" />
     <Compile Include="lib\gio-sharp\gio\generated\VolumeMonitor.cs" />
     <Compile Include="lib\gio-sharp\gio\generated\VolumeRemovedHandler.cs" />
-    <Compile Include="lib\gnome-keyring-sharp\AccessRights.cs" />
-    <Compile Include="lib\gnome-keyring-sharp\AssemblyInfo.cs" />
-    <Compile Include="lib\gnome-keyring-sharp\AttributeType.cs" />
-    <Compile Include="lib\gnome-keyring-sharp\GenericItemData.cs" />
-    <Compile Include="lib\gnome-keyring-sharp\ItemACL.cs" />
-    <Compile Include="lib\gnome-keyring-sharp\ItemData.cs" />
-    <Compile Include="lib\gnome-keyring-sharp\ItemType.cs" />
-    <Compile Include="lib\gnome-keyring-sharp\KeyringException.cs" />
-    <Compile Include="lib\gnome-keyring-sharp\KeyringInfo.cs" />
-    <Compile Include="lib\gnome-keyring-sharp\NetItemData.cs" />
-    <Compile Include="lib\gnome-keyring-sharp\NoteItemData.cs" />
-    <Compile Include="lib\gnome-keyring-sharp\Operation.cs" />
-    <Compile Include="lib\gnome-keyring-sharp\RequestMessage.cs" />
-    <Compile Include="lib\gnome-keyring-sharp\ResponseMessage.cs" />
-    <Compile Include="lib\gnome-keyring-sharp\ResultCode.cs" />
-    <Compile Include="lib\gnome-keyring-sharp\Ring.cs" />
     <Compile Include="lib\gtk-sharp-beans\AssemblyInfo.cs" />
     <Compile Include="lib\gtk-sharp-beans\Dialog.cs" />
     <Compile Include="lib\gtk-sharp-beans\Drawable.cs" />
@@ -2485,7 +2469,6 @@
     <None Include="lib\gio-sharp\gio\gio-sharp.dll.mdb" />
     <None Include="lib\gio-sharp\gio\gtk-sharp.snk" />
     <None Include="lib\gio-sharp\gio\snk" />
-    <None Include="lib\gnome-keyring-sharp\gnome-keyring-sharp.dll.mdb" />
     <None Include="lib\gtk-sharp-beans\Builder.custom" />
     <None Include="lib\gtk-sharp-beans\Gtk.metadata" />
     <None Include="lib\gtk-sharp-beans\gtk-api.raw" />
diff --git a/lib/Makefile.am b/lib/Makefile.am
index a4c9d3e..83fa6f8 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,7 +4,6 @@
 UNCONDITIONAL_SUBDIRS = \
 	GKeyFile 			\
 	gio-sharp			\
-	gnome-keyring-sharp	\
 	gtk-sharp-beans		\
 	libjpegtran			\
 	libfspot			\
diff --git a/src/f-spot.in b/src/f-spot.in
index 0145a95..90a3d38 100644
--- a/src/f-spot.in
+++ b/src/f-spot.in
@@ -55,7 +55,7 @@ for arg in "$@"; do
 	x--uninstalled)
 	    echo "*** Running uninstalled f-spot ***"
 	    EXE_TO_RUN="./f-spot.exe"
-	    export MONO_PATH=../lib/gnome-keyring-sharp:../lib/libgphoto2-sharp:../lib/semweb:../lib/mono-addins/Mono.Addins:../lib/mono-addins/Mono.Addins.Setup:../lib/mono-addins/Mono.Addins.Gui:../lib/gio-sharp/gio:../lib/gtk-sharp-beans:../lib/unique-sharp/unique:$MONO_PATH
+	    export MONO_PATH=../lib/libgphoto2-sharp:../lib/semweb:../lib/mono-addins/Mono.Addins:../lib/mono-addins/Mono.Addins.Setup:../lib/mono-addins/Mono.Addins.Gui:../lib/gio-sharp/gio:../lib/gtk-sharp-beans:../lib/unique-sharp/unique:$MONO_PATH
 	    ;;
     esac
 done