summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-26 13:20:33 -0600
committerTimothy Pearson <[email protected]>2013-01-26 13:20:33 -0600
commit94cd1d1a88d978799f28c2d0240a2755a2029e0c (patch)
tree14b90f21345c5d5e160fc3f75129b64c8986f43c
parentdc6b76cac424bdf8b3cffb4ae82f3954d8acdba5 (diff)
parent56b3a6bc534c03acb65e5bd2d1e2df69e9f46144 (diff)
downloadtdebase-94cd1d1a88d978799f28c2d0240a2755a2029e0c.tar.gz
tdebase-94cd1d1a88d978799f28c2d0240a2755a2029e0c.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
-rw-r--r--kioslave/smb/CMakeLists.txt1
-rw-r--r--kioslave/smb/ConfigureChecks.cmake7
2 files changed, 7 insertions, 1 deletions
diff --git a/kioslave/smb/CMakeLists.txt b/kioslave/smb/CMakeLists.txt
index c13277939..4591192c9 100644
--- 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(
diff --git a/kioslave/smb/ConfigureChecks.cmake b/kioslave/smb/ConfigureChecks.cmake
index 878682394..da4d1a942 100644
--- 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 )