banshee r3602 - in branches/banshee/stable: . build build/m4/banshee src/Extras/Gnome.Keyring

[sdroege svn gnome org]

Author: sdroege
Date: Sun Mar 30 16:29:46 2008
New Revision: 3602
URL: http://svn.gnome.org/viewvc/banshee?rev=3602&view=rev

Log:
* build/Common.Makefile:
* build/m4/banshee/gnome-keyring-sharp.m4:
* configure.ac:
* src/Extras/Gnome.Keyring/Makefile.am: Allow building against an
external gnome-keyring-sharp.


Added:
   branches/banshee/stable/build/m4/banshee/gnome-keyring-sharp.m4
Modified:
   branches/banshee/stable/ChangeLog
   branches/banshee/stable/build/Common.Makefile
   branches/banshee/stable/configure.ac
   branches/banshee/stable/src/Extras/Gnome.Keyring/Makefile.am

Modified: branches/banshee/stable/build/Common.Makefile
==============================================================================
--- branches/banshee/stable/build/Common.Makefile	(original)
+++ branches/banshee/stable/build/Common.Makefile	Sun Mar 30 16:29:46 2008
@@ -33,7 +33,12 @@
 LINK_HAL = -r:$(DIR_HAL)/Hal.dll
 LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
 LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+
+if EXTERNAL_GNOME_KEYRING_SHARP
+LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+else
 LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
+endif
 
 if EXTERNAL_NDESK_DBUS
 LINK_DBUS = $(NDESK_DBUS_LIBS)

Added: branches/banshee/stable/build/m4/banshee/gnome-keyring-sharp.m4
==============================================================================
--- (empty file)
+++ branches/banshee/stable/build/m4/banshee/gnome-keyring-sharp.m4	Sun Mar 30 16:29:46 2008
@@ -0,0 +1,16 @@
+AC_DEFUN([BANSHEE_CHECK_GNOME_KEYRING_SHARP],
+[
+	AC_ARG_ENABLE(external_gnome_keyring_sharp, AC_HELP_STRING([--enable-external-gnome-keyring-sharp], 
+		[Use external gnome-keyring-sharp instead of the bundled one]), 
+		enable_external_gnome_keyring_sharp="yes", enable_external_gnome_keyring_sharp="no")
+
+	if test "x$enable_external_gnome_keyring_sharp" = "xyes"; then
+		PKG_CHECK_MODULES(GNOME_KEYRING_SHARP, gnome-keyring-sharp)
+		AC_SUBST(GNOME_KEYRING_SHARP_LIBS)
+		AM_CONDITIONAL(EXTERNAL_GNOME_KEYRING_SHARP, true)
+	else
+		AC_MSG_RESULT([no])
+		AM_CONDITIONAL(EXTERNAL_GNOME_KEYRING_SHARP, false)
+	fi
+])
+

Modified: branches/banshee/stable/configure.ac
==============================================================================
--- branches/banshee/stable/configure.ac	(original)
+++ branches/banshee/stable/configure.ac	Sun Mar 30 16:29:46 2008
@@ -73,6 +73,9 @@
 dnl External notify-sharp libraries (optional)
 BANSHEE_CHECK_NOTIFY_SHARP
 
+dnl External gnome-keyring-sharp libraries (optional)
+BANSHEE_CHECK_GNOME_KEYRING_SHARP
+
 dnl Required dependencies (managed/core)
 BANSHEE_CHECK_GTK_SHARP
 PKG_CHECK_MODULES(SQLITE, sqlite3 >= 3.2)

Modified: branches/banshee/stable/src/Extras/Gnome.Keyring/Makefile.am
==============================================================================
--- branches/banshee/stable/src/Extras/Gnome.Keyring/Makefile.am	(original)
+++ branches/banshee/stable/src/Extras/Gnome.Keyring/Makefile.am	Sun Mar 30 16:29:46 2008
@@ -3,13 +3,16 @@
 ASSEMBLY_NAME = Gnome.Keyring
 ASSEMBLY = $(ASSEMBLY_NAME).dll
 
+ASSEMBLY_SOURCES = $(srcdir)/*.cs
+
+if !EXTERNAL_GNOME_KEYRING_SHARP
+
 gnome_keyringdir= $(pkglibdir)
 gnome_keyring_SCRIPTS = $(ASSEMBLY) $(ASSEMBLY).mdb
 
-ASSEMBLY_SOURCES = $(srcdir)/*.cs
-
 $(ASSEMBLY): $(ASSEMBLY_SOURCES)
 	$(BUILD_LIB) -out:$@ $(LINK_MONO_UNIX) $(ASSEMBLY_SOURCES)
+endif
 
 EXTRA_DIST = $(ASSEMBLY_SOURCES)