Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

add auto selection of libsecret with fallback to libgnome-keyring

Browse Source
This commit is contained in:
sehraf 2018-05-04 20:52:31 +02:00
parent 1129bcb0c0
commit c89e36a665
No known key found for this signature in database
GPG Key ID: DF09F6EAE356B2C6
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
retroshare.pri
View File

@ -340,13 +340,19 @@ linux-* {
QMAKE_LIBDIR *= "$$RS_LIB_DIR" QMAKE_LIBDIR *= "$$RS_LIB_DIR"
rs_autologin { rs_autologin {
#DEFINES *= HAS_GNOME_KEYRING # try libsecret first since it is not limited to gnome keyring and libgnome-keyring is deprecated
#PKGCONFIG *= gnome-keyring-1 LIBSECRET_AVAILABLE = $$system(pkg-config --exists libsecret-1 && echo yes)
isEmpty(LIBSECRET_AVAILABLE) {
message("using libgnome-keyring for auto login")
DEFINES *= HAS_GNOME_KEYRING
PKGCONFIG *= gnome-keyring-1
} else {
message("using libsecret for auto login")
DEFINES *= HAS_LIBSECRET DEFINES *= HAS_LIBSECRET
PKGCONFIG *= libsecret-1 PKGCONFIG *= libsecret-1
} }
} }
}
android-* { android-* {
isEmpty(NATIVE_LIBS_TOOLCHAIN_PATH) { isEmpty(NATIVE_LIBS_TOOLCHAIN_PATH) {