You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by jo...@apache.org on 2018/05/04 07:13:55 UTC
svn commit: r1830882 - in /subversion/trunk: build.conf
build/ac-macros/libsecret.m4 configure.ac
Author: jorton
Date: Fri May 4 07:13:55 2018
New Revision: 1830882
URL: http://svn.apache.org/viewvc?rev=1830882&view=rev
Log:
Fixes libsvn_auth_gnome_keyring.pc when configured with libsecret, and
make dependencies private.
* configure.ac, build/ac-macros/libsecret.m4:
Set SVN_GNOME_KEYRING_PCLIBS to libsecret/gnome-keyring as appropriate.
* build.conf (gnome-keyring):
Substitute SVN_GNOME_KEYRING_PCLIBS as private deps of
libsvn_auth_gnome_keyring in generated pkg-config file.
Reviewed by: philip
Modified:
subversion/trunk/build.conf
subversion/trunk/build/ac-macros/libsecret.m4
subversion/trunk/configure.ac
Modified: subversion/trunk/build.conf
URL: http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1830882&r1=1830881&r2=1830882&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Fri May 4 07:13:55 2018
@@ -1463,7 +1463,8 @@ external-lib = $(SVN_DB_LIBS)
[gnome-keyring]
type = lib
external-lib = $(SVN_GNOME_KEYRING_LIBS)
-pkg-config = gnome-keyring-1
+pkg-config = @SVN_GNOME_KEYRING_PCLIBS@
+pkg-config-private = yes
[kwallet]
type = lib
Modified: subversion/trunk/build/ac-macros/libsecret.m4
URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/libsecret.m4?rev=1830882&r1=1830881&r2=1830882&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/libsecret.m4 (original)
+++ subversion/trunk/build/ac-macros/libsecret.m4 Fri May 4 07:13:55 2018
@@ -54,6 +54,7 @@ AC_DEFUN(SVN_LIB_SECRET,
[Is libsecret support enabled?])
SVN_GNOME_KEYRING_INCLUDES="`$PKG_CONFIG --cflags libsecret-1`"
SVN_GNOME_KEYRING_LIBS="`$PKG_CONFIG --libs libsecret-1`"
+ SVN_GNOME_KEYRING_PCLIBS="libsecret-1"
found_gnome_keyring="yes"
else
if test "$with_gnome_keyring" = "yes"; then
@@ -90,4 +91,5 @@ AC_DEFUN(SVN_LIB_SECRET,
fi
AC_SUBST(SVN_GNOME_KEYRING_INCLUDES)
AC_SUBST(SVN_GNOME_KEYRING_LIBS)
+ AC_SUBST(SVN_GNOME_KEYRING_PCLIBS)
])
Modified: subversion/trunk/configure.ac
URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1830882&r1=1830881&r2=1830882&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Fri May 4 07:13:55 2018
@@ -593,6 +593,7 @@ if test "$with_old_gnome_keyring" != "no
[Is GNOME Keyring support enabled?])
CPPFLAGS="$old_CPPFLAGS"
SVN_GNOME_KEYRING_LIBS="`$PKG_CONFIG --libs glib-2.0 gnome-keyring-1`"
+ SVN_GNOME_KEYRING_PCLIBS="glib-2.0 gnome-keyring-1"
else
AC_MSG_RESULT([no])
if test "$with_old_gnome_keyring" = "yes"; then