[banshee] build: Make Boo Scripting disabled by default (bgo#690019)



commit e1263f866625847abc5aa2e216433edc0a9936dc
Author: Andres G. Aragoneses <knocte gmail com>
Date:   Tue Dec 11 17:35:12 2012 +0000

    build: Make Boo Scripting disabled by default (bgo#690019)
    
    As we mention in the roadmap [1], we're phasing out the Boo extension. For
    now instead of removing it completely we just mark it as disabled by
    default in the configuration phase (so you need to pass --enable-boo to
    enable it, instead of passing --disable-boo to disable it).

 build/m4/banshee/boo.m4 |   19 +++++++------------
 configure.ac            |    2 +-
 2 files changed, 8 insertions(+), 13 deletions(-)
---
diff --git a/build/m4/banshee/boo.m4 b/build/m4/banshee/boo.m4
index 3770c3c..d6b89ac 100644
--- a/build/m4/banshee/boo.m4
+++ b/build/m4/banshee/boo.m4
@@ -2,23 +2,18 @@ AC_DEFUN([BANSHEE_CHECK_BOO],
 [
 	BOO_REQUIRED=0.8.1
 
-	AC_ARG_ENABLE([boo], AC_HELP_STRING([--disable-boo], 
-		[Do not build with boo support]),
-		[
-			if test "x$enableval" = "xno"; then
-				enable_boo=no
-			elif test "x$enableval" = "xyes"; then
-				enable_boo=yes
-			fi
-		], enable_boo=yes
+	AC_ARG_ENABLE([boo],
+		[AC_HELP_STRING([--enable-boo], [Enable boo language support])],
+		[],
+		[enable_boo=no]
 	)
 
-	if test "x$enable_boo" = "xyes"; then
+	if test "x$enable_boo" = "xno"; then
+		AM_CONDITIONAL(HAVE_BOO, false)
+	else
 		PKG_CHECK_MODULES(BOO, boo >= $BOO_REQUIRED)
 		AC_SUBST(BOO_LIBS)
 		AM_CONDITIONAL(HAVE_BOO, true)
-	else
-		AM_CONDITIONAL(HAVE_BOO, false)
 	fi
 ])
 
diff --git a/configure.ac b/configure.ac
index baeaaa2..0826a6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -391,7 +391,6 @@ ${PACKAGE}-${VERSION}
   Extra Features:
     Web Browser:           ${have_libwebkit} (webkit-1.0 >= $WEBKIT_MIN_VERSION, libsoup-2.4 >= $SOUP_MIN_VERSION)
       + GNOME Proxy        ${have_libsoup_gnome} (libsoup-gnome-2.4 >= $SOUP_GNOME_MIN_VERSION)
-    Boo Scripting:         ${enable_boo} (boo >= $BOO_REQUIRED)
     DAAP:                  ${enable_daap}
     GIO Backend:           ${enable_gio} (gio-sharp >= $GIOSHARP_REQUIRED, gtk-sharp-beans >= $GNOMESHARP_REQUIRED)
     GIO Hardware:          ${enable_gio_hardware} (gudev-sharp >= $GUDEVSHARP_REQUIRED, gkeyfile-sharp >= $GKEYFILESHARP_REQUIRED)
@@ -399,6 +398,7 @@ ${PACKAGE}-${VERSION}
     Sound Menu:            ${enable_soundmenu}
     Ubuntu One Store:      ${enable_ubuntuone} (ubuntuone-sharp >= $UBUNTUONESHARP_REQUIRED)
     UPnP:                  ${enable_upnp} (mono-upnp >= $MONOUPNP_REQUIRED)
+    Boo Scripting:         ${enable_boo} (boo >= $BOO_REQUIRED)
 
   Build/Development:
     Unit Tests:            ${do_tests} (nunit >= ${NUNIT_REQUIRED})



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