--- configure.in.old	2006-12-30 18:56:40.000000000 +0100
+++ configure.in	2006-12-31 10:25:14.000000000 +0100
@@ -349,7 +349,20 @@
 
 dnl gsf-sharp
 
-PKG_CHECK_MODULES(GSF_SHARP, gsf-sharp >= 0.5, enable_gsf_sharp=yes, enable_gsf_sharp=no)
+AC_ARG_ENABLE([gsf-sharp],
+	AC_HELP_STRING([--disable-gsf-sharp], [Disable gsf-sharp support (default auto)]),
+	enable_gsf_sharp=$enableval,
+	enable_gsf_sharp=auto)
+
+if test "x$enable_gsf_sharp" != "xno"; then
+	PKG_CHECK_MODULES(GSF_SHARP, gsf-sharp >= 0.5, has_gsf_sharp=yes, has_gsf_sharp=no)
+	if test "x$enable_gsf_sharp" = "xyes" -a "x$has_gsf_sharp" != "xyes"; then
+		AC_MSG_ERROR([gsf-sharp >= 0.5 not found])
+	else
+		enable_gsf_sharp=$has_gsf_sharp
+	fi
+fi
+
 AM_CONDITIONAL(ENABLE_GSF_SHARP, test "x$enable_gsf_sharp" = "xyes")
 if test "x$enable_gsf_sharp" = "xyes"; then
 	BEAGLE_DEFINES="$BEAGLE_DEFINES -define:ENABLE_GSF_SHARP"