--- gtk-qt-engine/CMakeLists.txt.orig	2008-08-10 01:26:55.000000000 -0700
+++ gtk-qt-engine/CMakeLists.txt	2008-08-10 01:39:49.000000000 -0700
@@ -16,15 +16,20 @@
 MESSAGE(STATUS "Found GTK include dir: ${GTK_INCLUDE_DIR}")
 MESSAGE(STATUS "Found GTK library dir: ${GTK_LIB_DIR}")
 
-# Find Bonobo
-PKGCONFIG(libbonoboui-2.0 BONOBO_INCLUDE_DIR BONOBO_LIB_DIR BONOBO_LINK_FLAGS BONOBO_CFLAGS)
-IF (NOT BONOBO_INCLUDE_DIR)
-	MESSAGE(STATUS "bonoboui not found.  Some features of the theme engine will not work as intended.")
-ELSE (NOT BONOBO_INCLUDE_DIR)
-	MESSAGE(STATUS "Found Bonobo include dir: ${BONOBO_INCLUDE_DIR}")
-	MESSAGE(STATUS "Found Bonobo library dir: ${BONOBO_LIB_DIR}")
-	SET(BONOBO_DEFINITIONS -D HAVE_BONOBO)
-ENDIF (NOT BONOBO_INCLUDE_DIR)
+OPTION(ENABLE_BONOBO "Enable gnome bonobo support" ON)
+IF (ENABLE_BONOBO)
+	# Find Bonobo
+	PKGCONFIG(libbonoboui-2.0 BONOBO_INCLUDE_DIR BONOBO_LIB_DIR BONOBO_LINK_FLAGS BONOBO_CFLAGS)
+	IF (NOT BONOBO_INCLUDE_DIR)
+		MESSAGE(FATAL_ERROR "bonoboui was not found.  Ensure you have the libbonoboui development libraries installed, and libonoboui's pkgconfig files are in your pkgconfig search path.")
+	ELSE (NOT BONOBO_INCLUDE_DIR)
+		MESSAGE(STATUS "Found Bonobo include dir: ${BONOBO_INCLUDE_DIR}")
+		MESSAGE(STATUS "Found Bonobo library dir: ${BONOBO_LIB_DIR}")
+		SET(BONOBO_DEFINITIONS -D HAVE_BONOBO)
+	ENDIF (NOT BONOBO_INCLUDE_DIR)
+ELSE (ENABLE_BONOBO)
+	MESSAGE(STATUS "bonobo support disabled.  Some features of the theme engine will not work as intended.")
+ENDIF (ENABLE_BONOBO)
 
 # Find msgfmt
 SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake/Modules)