banshee r3858 - in trunk/banshee: . build/m4/banshee

[gburt svn gnome org]

Author: gburt
Date: Thu May  1 14:37:51 2008
New Revision: 3858
URL: http://svn.gnome.org/viewvc/banshee?rev=3858&view=rev

Log:
2008-05-01  Gabriel Burt  <gabriel burt gmail com>

	* build/m4/banshee/dap-mtp.m4:
	* configure.ac: Enable MTP support by default (if libmtp is available).


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/build/m4/banshee/dap-mtp.m4
   trunk/banshee/configure.ac

Modified: trunk/banshee/build/m4/banshee/dap-mtp.m4
==============================================================================
--- trunk/banshee/build/m4/banshee/dap-mtp.m4	(original)
+++ trunk/banshee/build/m4/banshee/dap-mtp.m4	Thu May  1 14:37:51 2008
@@ -2,8 +2,7 @@
 [
 	LIBMTP_REQUIRED=0.2.0
 
-	AC_ARG_ENABLE(mtp, AC_HELP_STRING([--enable-mtp], 
-		[Enable MTP DAP support]), , enable_mtp="no")
+	AC_ARG_ENABLE(mtp, AC_HELP_STRING([--disable-mtp], [Disable MTP DAP support]), , enable_mtp="if_able")
 	
 	enable_mtp_dap="${enable_mtp}"
 
@@ -11,10 +10,14 @@
 		libmtp >= $LIBMTP_REQUIRED,
 		enable_mtp_dap="$enable_mtp_dap", enable_mtp_dap=no)
 		
-	if test "x$enable_mtp" != "xno" -a "x$enable_mtp_dap" = "xno"; then
+	if test "x$enable_mtp" = "xyes" -a "x$enable_mtp_dap" = "xno"; then
 		AC_MSG_ERROR([libmtp was not found or is not up to date. Please install libmtp of at least version $LIBMTP_REQUIRED, or disable MTP support by not passing --enable-mtp])
 	fi
 
+	if test "x$enable_mtp_dap" = "xif_able"; then
+        enable_mtp_dap="yes"
+    fi
+
 	if test "x$enable_mtp_dap" = "xyes"; then
 		LIBMTP_SO_MAP=$(basename $(find $($PKG_CONFIG --variable=libdir libmtp) -maxdepth 1 -regex '.*libmtp\.so\.\w+$' | sort | tail -n 1))
 	fi

Modified: trunk/banshee/configure.ac
==============================================================================
--- trunk/banshee/configure.ac	(original)
+++ trunk/banshee/configure.ac	Thu May  1 14:37:51 2008
@@ -182,8 +182,8 @@
     Mono Runtime:      ${MONO}
 
     Digital Audio Player (DAP) Support:
-      Mass Storage:    yes	(unstable)
-      MTP:             ${enable_mtp_dap}	(unstable)
+      Mass Storage:    yes
+      MTP:             ${enable_mtp_dap}
       iPod:            ${enable_ipodsharp}	(unstable)
 
     DAAP Support:      ${enable_daap}	(unstable)