--- mysql-workbench-community-6.0.8-src/CMakeLists.txt	2013-11-06 17:13:54.000000000 +0100
+++ mysql-workbench-community-6.0.8-src/CMakeLists.txt	2013-11-09 17:08:40.472881231 +0100
@@ -18,6 +18,9 @@
 find_package(PkgConfig REQUIRED)
 
 find_package(GTK2 2.6.2 REQUIRED gtk gtkmm)
+if (NOT GTK2_FOUND)
+	message( FATAL_ERROR "Not all GTK2 components were found!" )
+endif()
 pkg_check_modules(GTHREAD REQUIRED gthread-2.0)
 pkg_check_modules(GMODULE REQUIRED gmodule-2.0)
 set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS} ${GTHREAD_INCLUDE_DIRS} ${GMODULE_INCLUDE_DIRS})
@@ -32,7 +35,8 @@
 endif ()
 
 # All known publicly available versions of Antlr3C are buggy
-
+# see: https://bugzilla.redhat.com/show_bug.cgi?id=966973
+# patch seems to be only applied partially to antlr-3.4, bug is present in antlr-3.5, too
 if (SKIP_BUNDLED_ANTLR)
   find_package(Antlr3C)
 endif ()
@@ -71,8 +75,8 @@
 find_package(TinyXML REQUIRED)
 
 if (UNIX)
-	option(USE_UNIXODBC "Use unixODBC instead of iODBC" OFF)
-	if (USE_UNIXODBC)
+	option(USE_IODBC "Use iODBC instead of unixODBC" ON)
+	if (NOT USE_IODBC)
 		find_package(UNIXODBC REQUIRED)
 		set(ODBC_LIBRARIES ${UNIXODBC_LIBRARIES})
 		set(ODBC_INCLUDE_DIRS ${UNIXODBC_INCLUDE_DIRS})
@@ -89,7 +93,8 @@
 pkg_check_modules(CAIRO REQUIRED cairo>=1.5.12)
 pkg_check_modules(UUID REQUIRED uuid)
 pkg_check_modules(LIBZIP REQUIRED libzip)
-if (UNIX)
+
+if (UNIX AND USE_GNOME_KEYRING)
 	pkg_check_modules(GNOME_KEYRING gnome-keyring-1)
 	if (GNOME_KEYRING_FOUND)
 		set(KEYRING_DEFINITION     "HAVE_GNOME_KEYRING")
@@ -99,6 +104,9 @@
 			set(KEYRING_DEFINITION     "HAVE_OLD_GNOME_KEYRING")
 		endif()
 	endif()
+	if (NOT GNOME_KEYRING_FOUND) 
+		message( FATAL_ERROR "Gnome keyring libraries could not be found" )
+	endif()
 endif()
 
 include (CheckFunctionExists)