Index: beagle/configure.in
===================================================================
--- beagle/configure.in	(revision 4405)
+++ beagle/configure.in	(working copy)
@@ -345,9 +345,24 @@
 
 dnl taglib-sharp: Needed for indexing audio formats
 
-PKG_CHECK_MODULES(TAGLIB_SHARP, taglib-sharp >= 2.0, internal_taglib=no, internal_taglib=yes)
+AC_ARG_ENABLE([internal-taglib],
+	AC_HELP_STRING([--enable-internal-taglib], [Use internal taglib-sharp (default auto)]),
+	enable_internal_taglib=$enableval,
+	enable_internal_taglib=auto)
+
+if test "x$enable_internal_taglib" != "xyes"; then
+	PKG_CHECK_MODULES(TAGLIB_SHARP, taglib-sharp >= 2.0, internal_taglib=no, internal_taglib=yes)
+	if test "x$enable_internal_taglib" = "xno" -a "x$internal_taglib" = "xyes"; then
+		AC_MSG_ERROR([taglib-sharp => 2.0 not found])
+	else
+		enable_internal_taglib=$internal_taglib
+	fi
+else
+	enable_internal_taglib="yes"
+fi
+
 AC_SUBST(TAGLIB_SHARP_LIBS)
-AM_CONDITIONAL(INTERNAL_TAGLIB, test "x$internal_taglib" = "xyes")
+AM_CONDITIONAL(INTERNAL_TAGLIB, test "x$enable_internal_taglib" = "xyes")
 
 dnl ----------------------------------------------
 
@@ -622,7 +637,7 @@
 	Epiphany Extension?	  ${enable_epiphany_extension}
 	Thunderbird Extension? 	  ${enable_tbird}
 
-	Local taglib-sharp?       ${internal_taglib}
+	Local taglib-sharp?       ${enable_internal_taglib}
 
 	Monitor screensaver       ${have_xss}
 	beagle-search GUI	  ${enable_gui}