Index: ConfigureChecks.cmake
===================================================================
--- ConfigureChecks.cmake	(revision 748426)
+++ ConfigureChecks.cmake	(working copy)
@@ -42,6 +42,15 @@
 if ( USABLE_ASSUAN_FOUND )
 
   # check if assuan has assuan_fd_t
+  set(CMAKE_REQUIRED_LIBRARIES_tmp ${CMAKE_REQUIRED_LIBRARIES}) #push
+  set(CMAKE_REQUIRED_INCLUDES_tmp ${CMAKE_REQUIRED_INCLUDES}) #push
+  set(CMAKE_REQUIRED_LIBRARIES ${_gpg_error_library})
+  set(CMAKE_REQUIRED_INCLUDES ${ASSUAN_INCLUDES})
+  if(MINGW)
+    set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${KDEWIN32_INCLUDE_DIR}/mingw)
+  elseif(MSVC)
+    set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${KDEWIN32_INCLUDE_DIR}/msvc)
+  endif(MINGW)
   check_cxx_source_compiles("
         #include <assuan.h>
         int main() {
@@ -98,12 +107,15 @@
     set( USABLE_ASSUAN_FOUND false )
   endif ( WIN32 AND NOT HAVE_ASSUAN_SOCK_GET_NONCE )  
 
+  set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_tmp}) #pop
+  set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_tmp}) #pop
+
 endif ( USABLE_ASSUAN_FOUND )
 
 if ( USABLE_ASSUAN_FOUND )
-  message( STATUS "Usable assuan found" )
+  message( STATUS "Usable assuan found for Kleopatra" )
 else ( USABLE_ASSUAN_FOUND )
-  message( STATUS "NO usable assuan found" )
+  message( STATUS "NO usable assuan found for Kleopatra" )
 endif ( USABLE_ASSUAN_FOUND )
 
 macro_bool_to_01( USABLE_ASSUAN_FOUND  HAVE_USABLE_ASSUAN )
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 748426)
+++ CMakeLists.txt	(working copy)
@@ -145,7 +145,6 @@
     customactions.cpp
     certmanager.cpp
     hierarchyanalyser.cpp
-    certificatewizardimpl.cpp
     crlview.cpp
     certlistview.cpp )