[banshee] build: Make gio-hardware be enabled by default (bgo#686584)



commit ad957935908cdc71425ff5a62a193301ee6ec0b3
Author: Andres G. Aragoneses <knocte gmail com>
Date:   Tue Dec 11 00:20:21 2012 +0000

    build: Make gio-hardware be enabled by default (bgo#686584)
    
    Before this change, at config time this M4 would determine if the GIO
    Hardware backend (now the default and unique hardware backend) would be
    built depending on the package dependencies present in the system.
    
    Problem is, if dependencies for it were not met, the default was to
    silently avoid building the backend.
    
    This commit changes this so it is now mandatory to pass the flag
    --disable-gio-hardware if the user wishes to compile without it.
    
    It doesn't completely solve bgo#686584 but helps alleviate the problem.
    And has the added benefit of making more versions of dependencies be
    clearly visible at the top of the macro.

 build/m4/banshee/gio.m4 |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)
---
diff --git a/build/m4/banshee/gio.m4 b/build/m4/banshee/gio.m4
index 76a7c00..c8b724d 100644
--- a/build/m4/banshee/gio.m4
+++ b/build/m4/banshee/gio.m4
@@ -2,6 +2,9 @@ AC_DEFUN([BANSHEE_CHECK_GIO_SHARP],
 [
 	GNOMESHARP_REQUIRED=2.8
 	GIOSHARP_REQUIRED=2.22.3
+
+	GUDEVSHARP_REQUIRED=0.1
+	GKEYFILESHARP_REQUIRED=0.1
 	
 	AC_ARG_ENABLE(gio, AC_HELP_STRING([--disable-gio], [Disable GIO for IO operations]), ,enable_gio="yes")
 	AC_ARG_ENABLE(gio_hardware, AC_HELP_STRING([--disable-gio-hardware], [Disable GIO Hardware backend]), ,enable_gio_hardware="yes")
@@ -38,13 +41,24 @@ AC_DEFUN([BANSHEE_CHECK_GIO_SHARP],
 		AC_SUBST(GIOSHARP_ASSEMBLIES)
 
 		if test "x$enable_gio_hardware" = "xyes"; then
+
+			has_gudev_sharp=no
 			PKG_CHECK_MODULES(GUDEV_SHARP,
-				gudev-sharp-1.0 >= 0.1,
-				enable_gio_hardware=yes, enable_gio_hardware=no)
+				gudev-sharp-1.0 >= $GUDEVSHARP_REQUIRED,
+				has_gudev_sharp=yes, has_gudev_sharp=no)
+
+			if test "x$has_gudev_sharp" = "xno"; then
+				AC_MSG_ERROR([gudev-sharp-1.0 was not found or is not up to date. Please install gudev-sharp-1.0 of at least version $GUDEVSHARP_REQUIRED, or disable GIO Hardware support by passing --disable-gio-hardware])
+			fi
 
+			has_gkeyfile_sharp=no
 			PKG_CHECK_MODULES(GKEYFILE_SHARP,
-				gkeyfile-sharp >= 0.1,
-				enable_gio_hardware="$enable_gio_hardware", enable_gio_hardware=no)
+				gkeyfile-sharp >= $GKEYFILESHARP_REQUIRED,
+				has_gkeyfile_sharp=yes, has_gkeyfile_sharp=no)
+
+			if test "x$has_gkeyfile_sharp" = "xno"; then
+				AC_MSG_ERROR([gkeyfile-sharp was not found or is not up to date. Please install gkeyfile-sharp of at least version $GKEYFILESHARP_REQUIRED, or disable GIO Hardware support by passing --disable-gio-hardware])
+			fi
 
 			if test "x$enable_gio_hardware" = "xno"; then
 				GUDEV_SHARP_LIBS=''



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