Author: astieger
Date: Thu Apr 12 22:03:06 2018
New Revision: 1829012
URL: http://svn.apache.org/viewvc?rev=1829012&view=rev
Log:
Follow-up to r1798004, fix informative output for Gnome Keyring with
libsecret
* subversion/svn/help-cmd.c (svn_cl__help): Print Gnome Keyring when
* using libsecret
* tools/client-side/svn-mergeinfo-normalizer/help-cmd.c
(svn_min__help): same
Modified:
subversion/trunk/subversion/svn/help-cmd.c
subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c
Modified: subversion/trunk/subversion/svn/help-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/help-cmd.c?rev=1829012&r1=1829011&r2=1829012&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/help-cmd.c (original)
+++ subversion/trunk/subversion/svn/help-cmd.c Thu Apr 12 22:03:06 2018
@@ -166,7 +166,7 @@ svn_cl__help(apr_getopt_t *os,
pool);
#endif
}
-#ifdef SVN_HAVE_GNOME_KEYRING
+#if (defined(SVN_HAVE_GNOME_KEYRING) || (SVN_HAVE_LIBSECRET))
svn_stringbuf_appendcstr(version_footer, "* Gnome Keyring\n");
#endif
#ifdef SVN_HAVE_GPG_AGENT
Modified: subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c?rev=1829012&r1=1829011&r2=1829012&view=diff
==============================================================================
--- subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c
(original)
+++ subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c Thu
Apr 12 22:03:06 2018
@@ -163,7 +163,7 @@ svn_min__help(apr_getopt_t *os,
pool)),
pool);
#endif
-#ifdef SVN_HAVE_GNOME_KEYRING
+#if (defined(SVN_HAVE_GNOME_KEYRING) || (SVN_HAVE_LIBSECRET))
svn_stringbuf_appendcstr(version_footer, "* Gnome Keyring\n");
#endif
#ifdef SVN_HAVE_GPG_AGENT
