Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

configure switch for ssh support #1316

Merged
1 commit merged into from

3 participants

Wolfgang Schupp Cory Fields Matthias Kortstiege
Wolfgang Schupp
Collaborator

As there were discussions on the forum and IRC about missing SFTP support in ubuntu packages I found that configure silently disables ssh sftp support if libssh is missing.
This enables a switch for libssh with the default being enabled, which is a change in behaviour(current is auto). The reason being to let packagers know, that they are - probably unknowingly - building without ssh support.

Wolfgang Schupp
Collaborator

sorry about the hunk. also added to final_message

Wolfgang Schupp
Collaborator

@theuni I squashed the old commits into this one. Since I'm kind of a git noob, your comments got lost, sorry about that.

Cory Fields
Owner

no worries, that's normal when you squash down.. you did it just right.

Thanks for making those changes. Looks good to me for September window.

Matthias Kortstiege
Collaborator

We missed the September window. Scheduled for October.

Wolfgang Schupp
Collaborator

is there still something to be changed from my side?

Deleted user ghost merged commit 7cd7792 into from
Lionel CHAZALLON LongChair referenced this pull request from a commit in plexinc/plex-home-theater-public
Lionel CHAZALLON LongChair Fix Adopt similar transcoding logic as other clients have #1316
 - Adds a new `Force Transcode Setting`
 - Unless this setting is active, transcoding quality will now act as a threshold to trigger transcoding.
 - Whatever is below won't get transcoded.
 - Whetever is above will be transcoded to the requested quality
7ef3187
This issue was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Oct 3, 2012
  1. Wolfgang Schupp

    Provide a configure switch for libssh.

    wsnipex authored
    default is enabled
This page is out of date. Refresh to see the latest.
Showing with 23 additions and 3 deletions.
  1. +22 −2 configure.in
  2. +1 −1  docs/README.linux
24 configure.in
View
@@ -130,7 +130,8 @@ vtbdecoder_enabled="== VTBDecoder support enabled. =="
vtbdecoder_disabled="== VTBDecoder support manually disabled. =="
openmax_disabled="== OpenMax support manually disabled. =="
openmax_not_found="== Could not find libnvomx. OpenMax support disabled. =="
-ssh_not_found="== Could not find libssh. SSH FTP VFS support disabled. =="
+ssh_not_found="== Could not find libssh. =="
+ssh_disabled="== SSH SFTP disabled. =="
librtmp_not_found="== Could not find libRTMP. RTMP support disabled. =="
librtmp_disabled="== RTMP support disabled. =="
libnfs_not_found="== Could not find libnfs. NFS client support disabled. =="
@@ -331,6 +332,12 @@ AC_ARG_ENABLE([pulse],
[use_pulse=$enableval],
[use_pulse=no])
+AC_ARG_ENABLE([ssh],
+ [AS_HELP_STRING([--disable-ssh],
+ [enable SSH SFTP support (default is enabled)])],
+ [use_ssh=$enableval],
+ [use_ssh=yes])
+
AC_ARG_ENABLE([rtmp],
[AS_HELP_STRING([--enable-rtmp],
[enable RTMP support via librtmp (default is auto)])],
@@ -931,7 +938,6 @@ AC_CHECK_LIB([ssl], [main],, AC_MSG_ERROR($missing_library))
if test "$use_mysql" = "yes"; then
AC_CHECK_LIB([mysqlclient], [main],, AC_MSG_ERROR($missing_library))
fi
-AC_CHECK_LIB([ssh], [sftp_tell64],, AC_MSG_RESULT([Could not find suitable version of libssh]))
AC_CHECK_LIB([bluetooth], [hci_devid],, AC_MSG_RESULT([Could not find suitable version of libbluetooth]))
AC_CHECK_LIB([yajl], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([tinyxml], [main],, AC_MSG_ERROR($missing_library))
@@ -1242,6 +1248,14 @@ else
USE_SKIN_TOUCHED=0
fi
+# libssh
+if test "x$use_ssh" = "xno"; then
+ AC_MSG_NOTICE($ssh_disabled)
+ use_libssh="no"
+else
+ AC_CHECK_LIB([ssh], [sftp_tell64],, AC_MSG_ERROR($ssh_not_found))
+ AC_DEFINE([HAVE_LIBSSH], [1], [Whether to use libSSH library.])
+fi
# libRTMP
if test "$use_librtmp" != "no"; then
@@ -2144,6 +2158,12 @@ else
USE_WEB_SERVER=0
fi
+if test "$use_libssh" != "no"; then
+ final_message="$final_message\n libssh support:\tYes"
+else
+ final_message="$final_message\n libssh support:\tNo"
+fi
+
if test "$use_librtmp" != "no"; then
final_message="$final_message\n libRTMP support:\tYes"
else
2  docs/README.linux
View
@@ -53,7 +53,7 @@ Build-Depends: autoconf, automake, autopoint, autotools-dev, cmake, curl,
libmysqlclient-dev, libnfs-dev, libogg-dev, libpcre3-dev, libplist-dev,
libpng12-dev | libpng-dev, libpostproc-dev, libpulse-dev, librtmp-dev,
libsamplerate-dev, libsdl-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev,
- libshairport-dev, libsmbclient-dev, libsqlite3-dev, libssl-dev,
+ libshairport-dev, libsmbclient-dev, libsqlite3-dev, libssh-dev, libssl-dev,
libswscale-dev, libtinyxml-dev, libtool, libudev-dev, libusb-dev, libva-dev,
libvdpau-dev, libvorbis-dev, libxinerama-dev, libxmu-dev, libxrandr-dev,
libxt-dev, libyajl-dev, lsb-release, nasm [!amd64], python-dev,
Something went wrong with that request. Please try again.