[banshee] build: Don't enable ipod-sharp support by default

[Gabriel Burt <gburt src gnome org>]

commit 7c21ce408932284b60c6802cbe2e33f396c054c4
Author: Gabriel Burt <gabriel burt gmail com>
Date:   Fri Apr 8 17:17:27 2011 -0500

    build: Don't enable ipod-sharp support by default

 build/m4/banshee/dap-ipod.m4 |   44 ++++++++++++----------
 configure.ac                 |   82 +++++++++++++++++++++---------------------
 2 files changed, 65 insertions(+), 61 deletions(-)
---
diff --git a/build/m4/banshee/dap-ipod.m4 b/build/m4/banshee/dap-ipod.m4
index ccc0894..8dbe5da 100644
--- a/build/m4/banshee/dap-ipod.m4
+++ b/build/m4/banshee/dap-ipod.m4
@@ -2,29 +2,33 @@ AC_DEFUN([BANSHEE_CHECK_DAP_IPOD],
 [
 	IPODSHARP_REQUIRED=0.8.5
 
-	AC_ARG_ENABLE(ipod, AC_HELP_STRING([--disable-ipod], [Disable iPod DAP support]), , enable_ipod="yes")
+	AC_ARG_ENABLE(ipod, AC_HELP_STRING([--enable-ipod], [Enable legacy ipod-sharp DAP support]), enable_ipod="yes", enable_ipod="no")
 
-	enable_ipodsharp="${enable_ipod}"
+	if test "x$enable_ipod" = "xyes"; then
+		enable_ipodsharp="${enable_ipod}"
+		PKG_CHECK_MODULES(IPODSHARP,
+			ipod-sharp >= $IPODSHARP_REQUIRED \
+			ipod-sharp-ui >= $IPODSHARP_REQUIRED,
+			enable_ipodsharp="$enable_ipodsharp", enable_ipodsharp=no)
 
-	PKG_CHECK_MODULES(IPODSHARP,
-		ipod-sharp >= $IPODSHARP_REQUIRED \
-		ipod-sharp-ui >= $IPODSHARP_REQUIRED,
-		enable_ipodsharp="$enable_ipodsharp", enable_ipodsharp=no)
-	
-	if test "x$enable_ipod" = "xyes" -a "x$enable_ipodsharp" = "xno"; then
-		AC_MSG_ERROR([ipod-sharp was not found or is not up to date. Please install ipod-sharp of at least version $IPODSHARP_REQUIRED, or disable iPod support by passing --disable-ipod])
-	fi
+		if test "x$enable_ipod" = "xyes" -a "x$enable_ipodsharp" = "xno"; then
+			AC_MSG_ERROR([ipod-sharp was not found or is not up to date. Please install ipod-sharp of at least version $IPODSHARP_REQUIRED, or disable iPod support by passing --disable-ipod])
+		fi
+
+		if test "x$enable_ipodsharp" = "xyes"; then
+			asms="`$PKG_CONFIG --variable=Libraries ipod-sharp` `$PKG_CONFIG --variable=Libraries ipod-sharp-ui`"
+			for asm in $asms; do
+				IPODSHARP_ASSEMBLIES="$IPODSHARP_ASSEMBLIES $asm"
+				[[ -r "$asm.mdb" ]] && IPODSHARP_ASSEMBLIES="$IPODSHARP_ASSEMBLIES $asm.mdb"
+			done
+			AC_SUBST(IPODSHARP_ASSEMBLIES)
+			AC_SUBST(IPODSHARP_LIBS)
+		fi
 
-	if test "x$enable_ipodsharp" = "xyes"; then
-		asms="`$PKG_CONFIG --variable=Libraries ipod-sharp` `$PKG_CONFIG --variable=Libraries ipod-sharp-ui`"
-		for asm in $asms; do
-			IPODSHARP_ASSEMBLIES="$IPODSHARP_ASSEMBLIES $asm"
-			[[ -r "$asm.mdb" ]] && IPODSHARP_ASSEMBLIES="$IPODSHARP_ASSEMBLIES $asm.mdb"
-		done
-		AC_SUBST(IPODSHARP_ASSEMBLIES)
-		AC_SUBST(IPODSHARP_LIBS)
+		AM_CONDITIONAL(ENABLE_IPOD, test "x$enable_ipodsharp" = "xyes")
+	else
+		enable_ipodsharp=no
+		AM_CONDITIONAL(ENABLE_IPOD, false)
 	fi
-	
-	AM_CONDITIONAL(ENABLE_IPOD, test "x$enable_ipodsharp" = "xyes")
 ])
 
diff --git a/configure.ac b/configure.ac
index 3da7764..2979c79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -393,58 +393,58 @@ cat <<EOF
 ${PACKAGE}-${VERSION}
 
   Build Environment
-    Install Prefix:    ${prefix}
-    Datadir:           ${expanded_datadir}
-    Libdir:            ${expanded_libdir}
+    Install Prefix:        ${prefix}
+    Datadir:               ${expanded_datadir}
+    Libdir:                ${expanded_libdir}
 
-    C Compiler:        ${CC}
-    Mono C# Compiler:  ${MCS} ${GMCS_FLAGS}
-    Mono Runtime:      ${MONO}
-    Gtk#:              ${gtk_version}
+    C Compiler:            ${CC}
+    Mono C# Compiler:      ${MCS} ${GMCS_FLAGS}
+    Mono Runtime:          ${MONO}
+    Gtk#:                  ${gtk_version}
 
   Video/Graphics:
-    Graphics System:   ${GRAPHICS_SUBSYSTEM}
-    X11 Video:         ${have_xvidmode}
-    Clutter:           ${enable_clutter}
+    Graphics System:       ${GRAPHICS_SUBSYSTEM}
+    X11 Video:             ${have_xvidmode}
+    Clutter:               ${enable_clutter}
 
   Operating System/Desktop Environment:
-    GNOME Support:     ${enable_gnome}
-    OSX Support:       ${enable_osx}
-    MeeGo Support:     ${enable_meego}
+    GNOME Support:         ${enable_gnome}
+    OSX Support:           ${enable_osx}
+    MeeGo Support:         ${enable_meego}
 
   Digital Audio Player (DAP) Support:
-    Mass Storage:      yes
-    MTP:               ${enable_libmtp}
-    Apple Device:      ${enable_appledevice}
-    iPod:              ${enable_ipodsharp}
-    Karma:             ${enable_karmasharp}
+    Mass Storage:          yes
+    MTP:                   ${enable_libmtp}
+    Apple Device:          ${enable_appledevice}
+    ipod-sharp (legacy):   ${enable_ipodsharp}
+    Karma:                 ${enable_karmasharp}
 
   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)
-      + Amazon MP3     ${have_libwebkit}
-      + Miro Guide     ${have_libwebkit}
-      + Wikipedia      ${have_libwebkit}
-    Boo Scripting:     ${enable_boo}
-    Builtin Equalizer: ${enable_builtin_equalizer}
-    DAAP:              ${enable_daap}
-    GIO Backend:       ${enable_gio} (glib >= 2.22, gtk-sharp-beans, and gio-sharp)
-    GIO Hardware:      ${enable_gio_hardware} (gudev-sharp, gkeyfile-sharp)
-    HAL Backend:       ${enable_hal}
-    Library Watcher:   ${HAVE_MONO_2_4_3} (Mono >= 2.4.3)
-    Podcasts:          ${enable_podcast}
-    Gapless playback:  ${ENABLE_GAPLESS} (gstreamer-plugins-base > 0.10.25.2)
-    YouTube extension: ${enable_youtube} (gdata-sharp >= 1.4)
-    Sound menu:        ${enable_soundmenu}
-    Ubuntu One Store:  ${enable_ubuntuone} (ubuntuone-sharp >= 0.3.2)
+    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)
+      + Amazon MP3         ${have_libwebkit}
+      + Miro Guide         ${have_libwebkit}
+      + Wikipedia          ${have_libwebkit}
+    Boo Scripting:         ${enable_boo}
+    Builtin Equalizer:     ${enable_builtin_equalizer}
+    DAAP:                  ${enable_daap}
+    GIO Backend:           ${enable_gio} (glib >= 2.22, gtk-sharp-beans, and gio-sharp)
+    GIO Hardware:          ${enable_gio_hardware} (gudev-sharp, gkeyfile-sharp)
+    HAL Backend:           ${enable_hal}
+    Library Watcher:       ${HAVE_MONO_2_4_3} (Mono >= 2.4.3)
+    Podcasts:              ${enable_podcast}
+    Gapless playback:      ${ENABLE_GAPLESS} (gstreamer-plugins-base > 0.10.25.2)
+    YouTube extension:     ${enable_youtube} (gdata-sharp >= 1.4)
+    Sound menu:            ${enable_soundmenu}
+    Ubuntu One Store:      ${enable_ubuntuone} (ubuntuone-sharp >= 0.3.2)
 
   Build/Development:
-    Unit Tests:        ${do_tests} (nunit >= ${NUNIT_REQUIRED})
-    API Docs:          ${enable_docs} (monodocer and mdassembler)
-    User Help:         ${enable_user_help} (gnome-doc-utils >= 0.17.3)
-    Custom a11y:       ${gtksharp_with_a11y} (gtk-sharp >= 2.12.10)
-    Release Build:     ${enable_release}
-    Vendor Build ID:   ${vendor_build_id}
+    Unit Tests:            ${do_tests} (nunit >= ${NUNIT_REQUIRED})
+    API Docs:              ${enable_docs} (monodocer and mdassembler)
+    User Help:             ${enable_user_help} (gnome-doc-utils >= 0.17.3)
+    Custom a11y:           ${gtksharp_with_a11y} (gtk-sharp >= 2.12.10)
+    Release Build:         ${enable_release}
+    Vendor Build ID:       ${vendor_build_id}
 
 EOF