Allow openssl detection without pkg-config file

Signed-off-by: Slávek Banko <slavek.banko@...>
(cherry picked from commit d7b8615289da74c47c996b050123d029e5e96045)

diff --git a/kcontrol/crypto/CMakeLists.txt b/kcontrol/crypto/CMakeLists.txt
index 4f0b43a..9a7f916 100644
--- a/kcontrol/crypto/CMakeLists.txt
+++ b/kcontrol/crypto/CMakeLists.txt
@@ -16,7 +16,15 @@
 if( WITH_SSL )
   pkg_search_module( SSL openssl )
   if( NOT SSL_FOUND )
-    tde_message_fatal( "SSL support are requested, but openssl is not found on your system" )
+    check_include_file( openssl/ssl.h HAVE_OPENSSL_H )
+    check_library_exists( ssl SSL_library_init "" HAVE_LIBSSL )
+    check_library_exists( crypto EVP_EncryptInit_ex "" HAVE_LIBCRYPTO )
+    if( HAVE_OPENSSL_H AND HAVE_LIBSSL AND HAVE_LIBCRYPTO )
+      set( SSL_FOUND 1 CACHE INTERNAL "" FORCE )
+    endif( HAVE_OPENSSL_H AND HAVE_LIBSSL AND HAVE_LIBCRYPTO )
+  endif( NOT SSL_FOUND )
+  if( NOT SSL_FOUND )
+    tde_message_fatal( "SSL support is requested, but openssl not found on your system" )
   endif( NOT SSL_FOUND )
   set( HAVE_SSL 1 CACHE INTERNAL "" FORCE )
 endif( WITH_SSL )

Fix build with smbclient in a samba specific directory

Signed-off-by: Slávek Banko <slavek.banko@...>
(cherry picked from commit 50d21388fb27b915d32b406fac9e587b632413e8)

diff --git a/tdeioslave/smb/CMakeLists.txt b/tdeioslave/smb/CMakeLists.txt
index 23cc1f0..c347c99 100644
--- a/tdeioslave/smb/CMakeLists.txt
+++ b/tdeioslave/smb/CMakeLists.txt
@@ -21,6 +21,7 @@
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
+  ${SMBCLIENT_LIBRARY_DIRS}
 )
 
 
diff --git a/tdeioslave/smb/ConfigureChecks.cmake b/tdeioslave/smb/ConfigureChecks.cmake
index da4d1a9..08eda73 100644
--- a/tdeioslave/smb/ConfigureChecks.cmake
+++ b/tdeioslave/smb/ConfigureChecks.cmake
@@ -18,7 +18,7 @@
 
 if( HAVE_LIBSMBCLIENT_H )
   set( SMBCLIENT_LIBRARIES smbclient )
-  check_library_exists( ${SMBCLIENT_LIBRARIES} smbc_new_context "" HAVE_SMBCLIENT )
+  check_library_exists( ${SMBCLIENT_LIBRARIES} smbc_new_context "${SMBCLIENT_LIBRARY_DIRS}" HAVE_SMBCLIENT )
 endif( )
 
 if( NOT HAVE_LIBSMBCLIENT_H OR NOT HAVE_SMBCLIENT )