--- configure.ac.orig	2009-01-24 01:02:06.000000000 +0100
+++ configure.ac	2009-01-24 01:37:22.000000000 +0100
@@ -49,11 +49,11 @@
 
 #
 # Use D-Bus as a fallback to get the keyring socket address
 #
 AC_ARG_ENABLE(dbus, 
-	      [  --enable-dbus[[=no/yes]]    compile with D-Bus support [[default: yes]]],
+	      [AC_HELP_STRING([--enable-dbus],[compile with D-Bus support default: yes])],
 	      ENABLE_DBUS="$enableval")
 AM_CONDITIONAL(ENABLE_DBUS, test "x$ENABLE_DBUS" != "xno")
 
 CSFLAGS=
 DBUS_LIBS=
@@ -67,19 +67,29 @@
 	CSFLAGS=" -d:WITH_DBUS "
 fi
 AC_SUBST(CSFLAGS)
 AC_SUBST(DBUS_LIBS)
 
-
-AC_PATH_PROG(MDASSEMBLER, mdassembler, no)
-AC_PATH_PROG(MONODOCER, monodocer, no)
-if test "x$MONODOCER" = "xno" -o "x$MDASSEMBLER" = "xno"; then
-  enable_monodoc=no
-  doc_sources_dir=
-else
-  enable_monodoc=yes
-  doc_sources_dir="`pkg-config --variable=sourcesdir monodoc`"
+AC_ARG_ENABLE(monodoc, 
+	      [AC_HELP_STRING([--enable-monodoc],[install monodoc documents default: yes])],
+	      [ENABLE_MONODOC="$enableval"])
+
+if test "x$ENABLE_MONODOC" != "xno" ; then
+	AC_PATH_PROG(MDASSEMBLER, mdassembler, no)
+	AC_PATH_PROG(MONODOCER, monodocer, no)
+
+	if test "x$MONODOCER" = "xno" -o "x$MDASSEMBLER" = "xno"; then
+		if test "x$ENABLE_MONODOC" = "xyes" ; then
+			AC_MSG_ERROR([monodoc can't be installed even though it was explicitly enabled. mdassembler or monodocer not found.])
+		else
+			enable_monodoc=no
+			doc_sources_dir=
+		fi
+	else
+		enable_monodoc=yes
+		doc_sources_dir="`pkg-config --variable=sourcesdir monodoc`"
+	fi
 fi
 
 AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_monodoc" = "xyes")
 AC_SUBST(CSC)
 AC_SUBST(RUNTIME)