mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-05 02:54:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #1535: configure: don't fail if 'sftp' support was not requested explicitly

Browse Source 
Before the patch default ./configure led to configure crash:
    checking for LIBSSH... no
    configure: error: libssh2 >= 1.2.5 library not found

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
This commit is contained in:
Sergei Trofimovich 2012-06-22 12:45:57 +03:00 committed by Slava Zanko
parent a343070843
commit bd59cea6ad
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/INSTALL
View File

@ -172,7 +172,7 @@ VFS options:
Support for FISH vfs Support for FISH vfs
`--enable-vfs-sftp' `--enable-vfs-sftp'
(off by default) (auto)
Support for SFTP vfs Support for SFTP vfs
`--enable-vfs-extfs' `--enable-vfs-extfs'

7
m4.include/vfs/mc-vfs-sftp.m4
View File

@ -2,7 +2,7 @@ dnl Enable SFTP filesystem
AC_DEFUN([AC_MC_VFS_SFTP], AC_DEFUN([AC_MC_VFS_SFTP],
[ [
AC_ARG_ENABLE([vfs-sftp], AC_ARG_ENABLE([vfs-sftp],
AS_HELP_STRING([--enable-vfs-sftp], [Support for SFTP filesystem [[yes]]])) AS_HELP_STRING([--enable-vfs-sftp], [Support for SFTP filesystem [auto]]))
if test "$enable_vfs" != "no" -a x"$enable_vfs_sftp" != x"no"; then if test "$enable_vfs" != "no" -a x"$enable_vfs_sftp" != x"no"; then
PKG_CHECK_MODULES(LIBSSH, [libssh2 >= 1.2.5], [found_libssh=yes], [:]) PKG_CHECK_MODULES(LIBSSH, [libssh2 >= 1.2.5], [found_libssh=yes], [:])
if test x"$found_libssh" = "xyes"; then if test x"$found_libssh" = "xyes"; then
@ -11,9 +11,12 @@ AC_DEFUN([AC_MC_VFS_SFTP],
MCLIBS="$MCLIBS $LIBSSH_LIBS" MCLIBS="$MCLIBS $LIBSSH_LIBS"
enable_vfs_sftp="yes" enable_vfs_sftp="yes"
else else
enable_vfs_sftp="no" if test x"$enable_vfs_sftp" = x"yes"; then
dnl user explicitly requested feature
AC_ERROR([libssh2 >= 1.2.5 library not found]) AC_ERROR([libssh2 >= 1.2.5 library not found])
fi fi
enable_vfs_sftp="no"
fi
fi fi
AM_CONDITIONAL([ENABLE_VFS_SFTP], [test "$enable_vfs" = "yes" -a x"$enable_vfs_sftp" = x"yes"]) AM_CONDITIONAL([ENABLE_VFS_SFTP], [test "$enable_vfs" = "yes" -a x"$enable_vfs_sftp" = x"yes"])
]) ])