diff -urN libuo-test/libubuntuone-0.3.1/bindings/mono/Makefile.am libubuntuone-0.3.1/bindings/mono/Makefile.am
--- libuo-test/libubuntuone-0.3.1/bindings/mono/Makefile.am	2010-05-11 22:10:09.000000000 +0400
+++ libubuntuone-0.3.1/bindings/mono/Makefile.am	2010-05-11 22:09:09.000000000 +0400
@@ -12,6 +12,8 @@
 
 EXTRA_DIST = ubuntuone.sources ubuntuone-api.metadata mono.snk AssemblyInfo.cs
 
+if ENABLE_MONO_BINDING
+
 ubuntuonesharpdir = $(libdir)/mono/ubuntuone-sharp-1.0
 ubuntuonesharp_DATA = ubuntuone-sharp.dll ubuntuone-sharp.dll.config
 
@@ -24,3 +26,5 @@
 ubuntuone-api.xml: ubuntuone.sources
 	$(MONO_GAPI_PARSER) $<
 	$(MONO_GAPI_FIXUP) --api=ubuntuone-api.xml --metadata=ubuntuone-api.metadata
+
+endif
diff -urN libuo-test/libubuntuone-0.3.1/bindings/python/Makefile.am libubuntuone-0.3.1/bindings/python/Makefile.am
--- libuo-test/libubuntuone-0.3.1/bindings/python/Makefile.am	2010-04-08 12:27:29.000000000 +0400
+++ libubuntuone-0.3.1/bindings/python/Makefile.am	2010-05-11 22:09:25.000000000 +0400
@@ -1,3 +1,5 @@
+if ENABLE_PYTHON_BINDING
+
 INCLUDES =				\
 	-I$(top_srcdir)/libubuntuone	\
 	$(LIBUBUNTUONE_CFLAGS)		\
@@ -34,3 +36,5 @@
 CLEANFILES = ubuntuone.c
 
 EXTRA_DIST = ubuntuone.defs ubuntuone.override
+
+endif
diff -urN libuo-test/libubuntuone-0.3.1/configure.ac libubuntuone-0.3.1/configure.ac
--- libuo-test/libubuntuone-0.3.1/configure.ac	2010-04-15 18:32:52.000000000 +0400
+++ libubuntuone-0.3.1/configure.ac	2010-05-11 22:12:00.000000000 +0400
@@ -68,27 +68,61 @@
 DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc"
 AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
 
-dnl Checks for Mono bindings
-AC_PATH_PROG(MONO_GAPI_PARSER, gapi2-parser, no)
-if test "x$MONO_GAPI_PARSER" = "xno"; then
-  AC_MSG_ERROR(could not find gapi2-parser)
-fi
-
-AC_PATH_PROG(MONO_GAPI_CODEGEN, gapi2-codegen, no)
-if test "x$MONO_GAPI_CODEGEN" = "xno"; then
-  AC_MSG_ERROR(could not find gapi2-codegen)
-fi
-
-AC_PATH_PROG(MONO_GAPI_FIXUP, gapi2-fixup, no)
-if test "x$MONO_GAPI_FIXUP" = "xno"; then
-  AC_MSG_ERROR(could not find gapi2-fixup)
-fi
-
-AC_PATH_PROG(MONO_CSC, gmcs, no)
-if test "x$MONO_CSC" = "xno"; then
-  AC_MSG_ERROR(could not find gmcs compiler)
-fi
-
+AC_ARG_ENABLE(
+	[mono-binding],
+	[AS_HELP_STRING(
+		[--enable-mono-binding],
+		[build mono bindings [default=yes]])],
+	[[ARG_ENABLE_MONO_BINDING=$enableval]],
+	[[ARG_ENABLE_MONO_BINDING=yes]]
+)
+
+AC_MSG_CHECKING([whether mono bindings should be built])
+AS_CASE(["$ARG_ENABLE_MONO_BINDING"],
+	["yes"], [
+	AC_MSG_RESULT([yes])
+
+	# dnl Checks for Mono bindings
+	AC_PATH_PROG(MONO_GAPI_PARSER, gapi2-parser, no)
+	if test "x$MONO_GAPI_PARSER" = "xno"; then
+	  AC_MSG_ERROR(could not find gapi2-parser)
+	fi
+
+	AC_PATH_PROG(MONO_GAPI_CODEGEN, gapi2-codegen, no)
+	if test "x$MONO_GAPI_CODEGEN" = "xno"; then
+	  AC_MSG_ERROR(could not find gapi2-codegen)
+	fi
+
+	AC_PATH_PROG(MONO_GAPI_FIXUP, gapi2-fixup, no)
+	if test "x$MONO_GAPI_FIXUP" = "xno"; then
+	  AC_MSG_ERROR(could not find gapi2-fixup)
+	fi
+
+	AC_PATH_PROG(MONO_CSC, gmcs, no)
+	if test "x$MONO_CSC" = "xno"; then
+	  AC_MSG_ERROR(could not find gmcs compiler)
+	fi],
+  ["no"], [
+	AC_MSG_RESULT([no])
+	],
+	[AC_MSG_RESULT([$ARG_ENABLE_MONO_BINDING])
+		AC_MSG_ERROR([Unknown option "$ARG_ENABLE_MONO_BINDING". Use either "yes" or "no".])]
+)
+
+
+AC_ARG_ENABLE(
+	[python-binding],
+	[AS_HELP_STRING(
+		[--enable-python-binding],
+		[build python bindings [default=yes]])],
+	[[ARG_ENABLE_PYTHON_BINDING=$enableval]],
+	[[ARG_ENABLE_PYTHON_BINDING=yes]]
+)
+
+AC_MSG_CHECKING([whether python bindings should be built])
+AS_CASE(["$ARG_ENABLE_PYTHON_BINDING"],
+	["yes"], [
+	AC_MSG_RESULT([yes])
 
 dnl Checks for Python bindings
 AM_PATH_PYTHON(2.5)
@@ -129,11 +163,21 @@
 else
   AC_SUBST(PYGNOME_CODEGEN, $PYGOBJECT_CODEGEN)
 fi
+],
+	["no"], [
+	AC_MSG_RESULT([no])
+	],
+	[AC_MSG_RESULT([$ARG_ENABLE_PYTHON_BINDING])
+		AC_MSG_ERROR([Unknown option "$ARG_ENABLE_PYTHON_BINDING". Use either "yes" or "no".])]
+)
 
 dnl JavaScript scripts location
 U1_JAVASCRIPT_DIR=$datadir/libubuntuone/$LIBUBUNTUONE_CURRENT/javascript
 AC_SUBST(U1_JAVASCRIPT_DIR)
 
+AM_CONDITIONAL([ENABLE_PYTHON_BINDING], [test "x$ARG_ENABLE_PYTHON_BINDING" = "xyes"])
+AM_CONDITIONAL([ENABLE_MONO_BINDING], [test "x$ARG_ENABLE_MONO_BINDING" = "xyes"])
+
 AC_OUTPUT([
 Makefile
 data/Makefile