fix the libssh2 include path somewhat when --with-libssh2 is used and added
a warning output if no OpenSSL was found
This commit is contained in:
parent
6f2afe0c30
commit
b9af0d89d5
@ -1072,11 +1072,11 @@ if test X"$OPT_LIBSSH2" != Xno; then
|
|||||||
PREFIX_LIBSSH2=
|
PREFIX_LIBSSH2=
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
dnl check the given --with-libssh2 spot
|
dnl use the given --with-libssh2 spot
|
||||||
PREFIX_LIBSSH2=$OPT_LIBSSH2
|
PREFIX_LIBSSH2=$OPT_LIBSSH2
|
||||||
LIB_LIBSSH2="$PREFIX_LIBSSH2/lib$libsuff"
|
LIB_LIBSSH2="$PREFIX_LIBSSH2/lib$libsuff"
|
||||||
LDFLAGS="$LDFLAGS -L$LIB_LIBSSH2"
|
LDFLAGS="$LDFLAGS -L$LIB_LIBSSH2"
|
||||||
CPPFLAGS="$CPPFLAGS -I$PREFIX_LIBSSH2/include/libssh2 -I$PREFIX_LIBSSH2/include"
|
CPPFLAGS="$CPPFLAGS -I$PREFIX_LIBSSH2/include"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
@ -1095,6 +1095,8 @@ if test X"$OPT_LIBSSH2" != Xno; then
|
|||||||
test "$LIBSSH2_ENABLED" != "1"; then
|
test "$LIBSSH2_ENABLED" != "1"; then
|
||||||
AC_MSG_ERROR([libSSH2 libs and/or directories were not found where specified!])
|
AC_MSG_ERROR([libSSH2 libs and/or directories were not found where specified!])
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
AC_MSG_WARN([without the use of OpenSSL libs, libssh2 cannot work])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$LIBSSH2_ENABLED" = "1"; then
|
if test "$LIBSSH2_ENABLED" = "1"; then
|
||||||
|
Loading…
Reference in New Issue
Block a user