39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
|
--- subversion-1.10.0/build/ac-macros/libsecret.m4.pkgsecret
|
||
|
|
+++ subversion-1.10.0/build/ac-macros/libsecret.m4
|
||
|
|
@@ -54,6 +54,7 @@
|
||
|
|
[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 @@
|
||
|
|
fi
|
||
|
|
AC_SUBST(SVN_GNOME_KEYRING_INCLUDES)
|
||
|
|
AC_SUBST(SVN_GNOME_KEYRING_LIBS)
|
||
|
|
+ AC_SUBST(SVN_GNOME_KEYRING_PCLIBS)
|
||
|
|
])
|
||
|
|
--- subversion-1.10.0/build.conf.pkgsecret
|
||
|
|
+++ subversion-1.10.0/build.conf
|
||
|
|
@@ -1464,7 +1464,8 @@
|
||
|
|
[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
|
||
|
|
--- subversion-1.10.0/configure.ac.pkgsecret
|
||
|
|
+++ subversion-1.10.0/configure.ac
|
||
|
|
@@ -593,6 +593,7 @@
|
||
|
|
[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
|