summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Golubev <fatzer2@gmail.com>2023-12-25 04:49:57 +0300
committerAlexander Golubev <fatzer2@gmail.com>2023-12-25 04:49:57 +0300
commitf2dbf5b9035e9a4861b7d0ad348f4f86c4caba03 (patch)
tree57a666338a3cdd0934492401777262816dbd3c61
parentecd60bc6a5f5181bb5013bea114fae5d8efaab47 (diff)
downloadtdebase-f2dbf5b9035e9a4861b7d0ad348f4f86c4caba03.tar.gz
tdebase-f2dbf5b9035e9a4861b7d0ad348f4f86c4caba03.zip
Make dependency upon libssh optional
Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
-rw-r--r--CMakeLists.txt2
-rw-r--r--ConfigureChecks.cmake2
-rw-r--r--tdeioslave/CMakeLists.txt2
3 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36124f6fe..e7ab1d23c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,6 +97,7 @@ option( WITH_ALL_OPTIONS "Enable all optional support" OFF )
option( WITH_SASL "Enable SASL support" ${WITH_ALL_OPTIONS} )
option( WITH_LDAP "Enable LDAP support" ${WITH_ALL_OPTIONS} )
option( WITH_SAMBA "Enable SAMBA support" ${WITH_ALL_OPTIONS} )
+option( WITH_SFTP "Enable SFTP support" ${WITH_ALL_OPTIONS} )
option( WITH_OPENEXR "Enable openexr support" ${WITH_ALL_OPTIONS} )
option( WITH_XCOMPOSITE "Enable xcomposite support" ${WITH_ALL_OPTIONS} )
option( WITH_XCURSOR "Enable xcursor support" ${WITH_ALL_OPTIONS} )
@@ -130,6 +131,7 @@ option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden"
# WITH_SASL affects tdeioslaves(tdeio_ldap tdeio_smtp tdeio_pop3)
# WITH_LDAP affects tdeioslaves(tdeio_ldap)
# WITH_SAMBA affects tdeioslaves(tdeio_samba) kcontrol
+# WITH_SFTP affects tdeioslaves(tdeio_sftp)
# WITH_OPENEXR affects tdeioslaves(thumbnail)
# WITH_XCOMPOSITE affects twin kicker(taskmanager) tdm
# WITH_XCURSOR affects tdeioslaves(thumbnail), kcontrol(input), kdesktop
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 2a470eeb8..ea441f447 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -100,7 +100,7 @@ if( BUILD_KSMSERVER OR BUILD_KSPLASHML OR BUILD_TDEIOSLAVES )
endif( )
# libssh (tdeioslave/sftp)
-if( BUILD_TDEIOSLAVES )
+if( BUILD_TDEIOSLAVES AND WITH_SFTP )
pkg_search_module( LIBSSH libssh )
if( NOT LIBSSH_FOUND )
tde_message_fatal( "LibSSH is required, but was not found on your system" )
diff --git a/tdeioslave/CMakeLists.txt b/tdeioslave/CMakeLists.txt
index 56b05c852..5b0f0c155 100644
--- a/tdeioslave/CMakeLists.txt
+++ b/tdeioslave/CMakeLists.txt
@@ -23,7 +23,6 @@ add_subdirectory( nfs )
add_subdirectory( nntp )
add_subdirectory( pop3 )
add_subdirectory( smtp )
-add_subdirectory( sftp )
add_subdirectory( tar )
add_subdirectory( finger )
add_subdirectory( thumbnail )
@@ -35,3 +34,4 @@ add_subdirectory( home )
add_subdirectory( system )
tde_conditional_add_subdirectory( WITH_LDAP ldap )
tde_conditional_add_subdirectory( WITH_SAMBA smb )
+tde_conditional_add_subdirectory( WITH_SFTP sftp )