[banshee] [build] Use non-GAC'd gio-sharp/gtk#beans
- From: Gabriel Burt <gburt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee] [build] Use non-GAC'd gio-sharp/gtk#beans
- Date: Wed, 1 Sep 2010 19:05:24 +0000 (UTC)
commit c965fb2a67b00fc611fbe71e63dd5855ba36c03c
Author: Gabriel Burt <gabriel burt gmail com>
Date: Wed Sep 1 14:02:02 2010 -0500
[build] Use non-GAC'd gio-sharp/gtk#beans
build/m4/banshee/gio.m4 | 14 ++++++++++----
src/Backends/Banshee.Gio/Makefile.am | 14 ++++++++++++++
2 files changed, 24 insertions(+), 4 deletions(-)
---
diff --git a/build/m4/banshee/gio.m4 b/build/m4/banshee/gio.m4
index 679b8dc..2b96e60 100644
--- a/build/m4/banshee/gio.m4
+++ b/build/m4/banshee/gio.m4
@@ -7,24 +7,30 @@ AC_DEFUN([BANSHEE_CHECK_GIO_SHARP],
if test "x$enable_gio" = "xyes"; then
PKG_CHECK_MODULES(GTKSHARP_BEANS,
- gtk-sharp-beans-2.0 >= $GNOMESHARP_REQUIRED,
+ gtksharp-beans-2.0 >= $GNOMESHARP_REQUIRED,
enable_gio=yes, enable_gio=no)
PKG_CHECK_MODULES(GIOSHARP,
- gio-sharp-2.0 >= $GNOMESHARP_REQUIRED,
+ gio-sharp-2.0 >= 2.22,
enable_gio="$enable_gio", enable_gio=no)
+ asms="`$PKG_CONFIG --variable=Libraries gio-sharp-2.0` `$PKG_CONFIG --variable=Libraries gtksharp-beans-2.0`"
+ for asm in $asms; do
+ GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm"
+ done
+ AC_SUBST(GIOSHARP_ASSEMBLIES)
+
PKG_CHECK_MODULES(GLIB_2_22,
glib-2.0 >= 2.22,
enable_gio="$enable_gio", enable_gio=no)
if test "x$enable_gio_hardware" = "xyes"; then
PKG_CHECK_MODULES(GUDEV_SHARP,
- gudev-sharp-1.0 >= 0.1,
+ gudev-sharp >= 0.1,
enable_gio_hardware="$enable_gio", enable_gio_hardware=no)
PKG_CHECK_MODULES(GKEYFILE_SHARP,
- gkeyfile-sharp-1.0 >= 0.1,
+ gkeyfile-sharp >= 0.1,
enable_gio_hardware="$enable_gio_hardware", enable_gio_hardware=no)
if test "x$enable_gio_hardware" = "xno"; then
diff --git a/src/Backends/Banshee.Gio/Makefile.am b/src/Backends/Banshee.Gio/Makefile.am
index 86edf64..d65842b 100644
--- a/src/Backends/Banshee.Gio/Makefile.am
+++ b/src/Backends/Banshee.Gio/Makefile.am
@@ -37,8 +37,22 @@ SOURCES = \
RESOURCES = Banshee.Gio.addin.xml
+EXTRA_BUNDLE = $(GIOSHARP_ASSEMBLIES)
+
if ENABLE_GIO
include $(top_srcdir)/build/build.mk
+
+define EXTRA_INSTALL_DATA_HOOK
+ for ASM in $(GIOSHARP_ASSEMBLIES); do \
+ $(INSTALL) -m 0755 $$ASM $(DESTDIR)$(moduledir); \
+ done;
+endef
+
+define EXTRA_UNINSTALL_HOOK
+ for ASM in $(GIOSHARP_ASSEMBLIES); do \
+ rm -f $(DESTDIR)$(moduledir)/`basename $$ASM`; \
+ done;
+endef
else
EXTRA_DIST = $(SOURCES) $(RESOURCES)
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]