Make dependency upon libssh optional

Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
(cherry picked from commit f2dbf5b903)
pull/478/head
Alexander Golubev 11 months ago committed by Michele Calgaro
parent 6c06794072
commit c55cad68e9
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -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

@ -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" )

@ -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 )

Loading…
Cancel
Save