[balsa] libsecret use: fix confusing 'configure' option comment, and default to link against libsecret inste
- From: Albrecht Dreß <albrecht src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa] libsecret use: fix confusing 'configure' option comment, and default to link against libsecret inste
- Date: Wed, 11 Mar 2020 18:27:58 +0000 (UTC)
commit 2c5b21d486f12311c0d544e8fe0b2870848098c3
Author: Albrecht Dreß <albrecht dress arcor de>
Date: Wed Mar 11 19:24:00 2020 +0100
libsecret use: fix confusing 'configure' option comment, and default to link
against libsecret instead of storing obfuscated passwords in a text file.
configure.ac | 11 ++++++-----
meson.build | 2 +-
meson_options.txt | 4 ++--
3 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 35eedcd54..b726df685 100644
--- a/configure.ac
+++ b/configure.ac
@@ -124,8 +124,8 @@ AC_ARG_WITH([sqlite],
AC_ARG_WITH(libsecret,
AC_HELP_STRING([--with-libsecret],
- [Link to libsecret instead of gnome-keyring (default=no)]),
- [with_libsecret=$withval],[with_libsecret=no])
+ [Use libsecret to store credentials (default=yes)]),
+ [with_libsecret=$withval],[with_libsecret=yes])
AC_ARG_WITH(gcr,
AC_HELP_STRING([--with-gcr],
@@ -496,14 +496,15 @@ fi
AC_MSG_CHECKING([whether to configure for libsecret])
if test x$with_libsecret != xno; then
AC_MSG_RESULT([yes])
- PKG_CHECK_MODULES(LIBSECRET, [ libsecret-1 ], [],
- AC_MSG_ERROR([[You asked to link to libsecret, but
- the development tool is not installed]]))
+ PKG_CHECK_MODULES(LIBSECRET, [ libsecret-1 ])
AC_DEFINE(HAVE_LIBSECRET,1,[Defined when libsecret can be used.])
BALSA_CFLAGS="$BALSA_CFLAGS $LIBSECRET_CFLAGS"
BALSA_LIBS="$BALSA_LIBS $LIBSECRET_LIBS"
else
AC_MSG_RESULT([no])
+ AC_MSG_WARN([libsecret support is disabled. Balsa will store the
+ the obfuscated passwords in ~/.balsa/config-private,
+ which is usually not what you want.])
fi
dnl #####################################################################
diff --git a/meson.build b/meson.build
index 82681f48b..6cb6731c4 100644
--- a/meson.build
+++ b/meson.build
@@ -381,7 +381,7 @@ endif # igemacint
if libsecret
secret_dep = dependency('libsecret-1', required : false)
if not secret_dep.found()
- error('You asked to link to libsecret, but the development tool is not installed')
+ error('You asked to link to libsecret, but the development files are not installed')
endif
conf.set('HAVE_LIBSECRET', 1,
description : 'Defined when libsecret can be used.')
diff --git a/meson_options.txt b/meson_options.txt
index 230052752..09bcf2af4 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -77,8 +77,8 @@ option('sqlite',
option('libsecret',
type : 'boolean',
- value : false,
- description : 'Link to libsecret (default=false)')
+ value : true,
+ description : 'Link to libsecret (default=true)')
option('gcr',
type : 'boolean',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]