Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-python/Makefile.am,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile.am
--- Makefile.am 24 Jul 2006 22:41:55 -0000  1.36
+++ Makefile.am 13 Dec 2006 20:49:45 -0000
@@ -1,6 +1,14 @@
 AUTOMAKE_OPTIONS = 1.6
 
-SUBDIRS = gnome bonobo docs
+SUBDIRS = docs
+
+if BUILD_GNOME
+SUBDIRS += gnome
+endif
+
+if BUILD_BONOBO
+SUBDIRS += bonobo
+endif
 
 if BUILD_GCONF
 SUBDIRS += gconf
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gnome-python/configure.in,v
retrieving revision 1.107
diff -u -p -r1.107 configure.in
--- configure.in    5 Nov 2006 17:45:53 -0000   1.107
+++ configure.in    13 Dec 2006 20:49:45 -0000
@@ -116,10 +116,13 @@ if test -n "$export_dynamic"; then
   GTK_LIBS=`echo $GTK_LIBS | sed -e "s/$export_dynamic//"`
 fi
 
-PKG_CHECK_MODULES(GNOME, libgnome-2.0 >= libgnome_required_version,,
-  [AC_MSG_ERROR(libgnome-2.0 is required.)])
+build_gnome=false
+PKG_CHECK_MODULES(GNOME, libgnome-2.0 >= libgnome_required_version,
+  build_gnome=true,
+  build_gnome=false)
 AC_SUBST(GNOME_CFLAGS)
 AC_SUBST(GNOME_LIBS)
+AM_CONDITIONAL(BUILD_GNOME, $build_gnome)
 if test -n "$export_dynamic"; then
   GNOME_LIBS=`echo $GNOME_LIBS | sed -e "s/$export_dynamic//"`
 fi