mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-12-25 23:49:35 -05:00
switched libssh to 0.5.4
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
22782e5edd
commit
579b04db05
@ -144,7 +144,7 @@ introserver {
|
|||||||
|
|
||||||
|
|
||||||
sshserver {
|
sshserver {
|
||||||
LIBSSH_DIR = ../../../../libssh-0.5.2
|
LIBSSH_DIR = ../../../../libssh-0.5.4
|
||||||
|
|
||||||
# This Requires libssh-0.5.* to compile.
|
# This Requires libssh-0.5.* to compile.
|
||||||
# Modify path below to point at it.
|
# Modify path below to point at it.
|
||||||
@ -164,7 +164,7 @@ sshserver {
|
|||||||
|
|
||||||
win32 {
|
win32 {
|
||||||
DEFINES *= LIBSSH_STATIC
|
DEFINES *= LIBSSH_STATIC
|
||||||
LIBSSH_DIR = ../../../libssh-0.5.2
|
LIBSSH_DIR = ../../../libssh-0.5.4
|
||||||
}
|
}
|
||||||
|
|
||||||
INCLUDEPATH += $$LIBSSH_DIR/include/
|
INCLUDEPATH += $$LIBSSH_DIR/include/
|
||||||
@ -173,7 +173,7 @@ sshserver {
|
|||||||
LIBS += -lssh
|
LIBS += -lssh
|
||||||
LIBS += -lssh_threads
|
LIBS += -lssh_threads
|
||||||
} else {
|
} else {
|
||||||
SSH_OK = $$system(pkg-config --atleast-version 0.5.2 libssh && echo yes)
|
SSH_OK = $$system(pkg-config --atleast-version 0.5.4 libssh && echo yes)
|
||||||
isEmpty(SSH_OK) {
|
isEmpty(SSH_OK) {
|
||||||
exists($$LIBSSH_DIR/build/src/libssh.a):exists($$LIBSSH_DIR/build/src/threads/libssh_threads.a) {
|
exists($$LIBSSH_DIR/build/src/libssh.a):exists($$LIBSSH_DIR/build/src/threads/libssh_threads.a) {
|
||||||
LIBS += $$LIBSSH_DIR/build/src/libssh.a
|
LIBS += $$LIBSSH_DIR/build/src/libssh.a
|
||||||
|
Loading…
Reference in New Issue
Block a user