[banshee] Enable webkit/wikipedia extension by default

[Gabriel Burt <gburt src gnome org>]

commit 95b152346ed55f62b938b3279dd6a9476b6ff1a2
Author: Gabriel Burt <gabriel burt gmail com>
Date:   Fri Jan 29 15:20:09 2010 -0800

    Enable webkit/wikipedia extension by default
    
    Pass --disable-webkit to configure to disable.

 build/m4/banshee/webkit.m4 |    2 +-
 configure.ac               |   10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/build/m4/banshee/webkit.m4 b/build/m4/banshee/webkit.m4
index 563d228..72ec9f6 100644
--- a/build/m4/banshee/webkit.m4
+++ b/build/m4/banshee/webkit.m4
@@ -1,6 +1,6 @@
 AC_DEFUN([BANSHEE_CHECK_WEBKIT],
 [
-	AC_ARG_ENABLE(webkit, AC_HELP_STRING([--enable-webkit], [Enable experimental Wikipedia extension - unfinished, likely broken]), , enable_webkit="no")
+	AC_ARG_ENABLE(webkit, AC_HELP_STRING([--disable-webkit], [Disable Wikipedia extension that requires webkit-sharp]), , enable_webkit="yes")
 
 	if test "x$enable_webkit" = "xyes"; then
 		PKG_CHECK_MODULES(WEBKIT, webkit-sharp-1.0 >= 0.2)
diff --git a/configure.ac b/configure.ac
index 304788e..a07e7e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,7 +98,7 @@ BANSHEE_CHECK_BOO
 dnl Monodoc (optional through --disable-docs)
 SHAMROCK_CHECK_MONODOC
 
-dnl webkit (optional through --enable-webkit)
+dnl webkit (optional through --disable-webkit)
 BANSHEE_CHECK_WEBKIT
 
 dnl gtk#-beans and gio#
@@ -340,12 +340,13 @@ ${PACKAGE}-${VERSION}
     Karma:             ${enable_karmasharp}
 
   Extra Features:
-    DAAP Support:      ${enable_daap}
-    Podcast Support:   ${enable_podcast}
     Boo Scripting:     ${enable_boo}
     Builtin Equalizer: ${enable_builtin_equalizer}
+    DAAP:              ${enable_daap}
+    GIO Backend:       ${enable_gio} (requires glib >= 2.22, gtk-sharp-beans, and gio-sharp)
     Library Watcher:   ${HAVE_MONO_2_4_3} (requires Mono >= 2.4.3)
-    GIO Support:       ${enable_gio} (requires glib >= 2.22, gtk-sharp-beans, and gio-sharp)
+    Podcasts:          ${enable_podcast}
+    Wikipedia:         ${enable_webkit} (requires webkit-sharp)
 
   Build/Development:
     Unit Tests:        ${do_tests} (requires nunit >= ${NUNIT_REQUIRED})
@@ -358,7 +359,6 @@ EOF
 # Unstable/in-development features; only show them if they were manually enabled
 if test "x$enable_moonlight" = "xyes";    then br=yes; echo "  Moonlight Effects:   ${enable_moonlight}";    fi
 if test "x$enable_remote_audio" = "xyes"; then br=yes; echo "  Remote Audio:        ${enable_remote_audio}"; fi
-if test "x$enable_webkit" = "xyes";       then br=yes; echo "  WebKit:              ${enable_webkit}";     fi
 if test "x$enable_torrent" = "xyes";      then br=yes; echo "  Torrent Podcasts:    ${enable_torrent}";      fi
 
 if test -d ${expanded_libdir}/${PACKAGE}; then