Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase

11 years ago · 94cd1d1a88
parent dc6b76cac4 56b3a6bc53
commit 94cd1d1a88
2 changed files with 7 additions and 1 deletions
--- a/kioslave/smb/CMakeLists.txt
+++ b/kioslave/smb/CMakeLists.txt
@ -16,6 +16,7 @@ include_directories(
  ${CMAKE_BINARY_DIR}
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
+  ${SMBCLIENT_INCLUDE_DIRS}
 )

 link_directories(
--- a/kioslave/smb/ConfigureChecks.cmake
+++ b/kioslave/smb/ConfigureChecks.cmake
@ -9,7 +9,12 @@
 #
 #################################################

-check_include_file( libsmbclient.h HAVE_LIBSMBCLIENT_H )
+pkg_search_module ( SMBCLIENT smbclient )
+if( SMBCLIENT_FOUND ) 
+  set( HAVE_LIBSMBCLIENT_H 1 )
+else( )
+  check_include_file( libsmbclient.h HAVE_LIBSMBCLIENT_H )
+endif( )

 if( HAVE_LIBSMBCLIENT_H )
  set( SMBCLIENT_LIBRARIES smbclient )