[gnome-keyring: 12/12] Merge branch 'gnome-3-2'

[Stefan Walter <stefw src gnome org>]

commit 471f694e6b08ce8b79e9ce9a53f780485c9ddf19
Merge: 54be473 bc01094
Author: Stef Walter <stefw collabora co uk>
Date:   Mon Oct 24 08:50:00 2011 +0200

    Merge branch 'gnome-3-2'

 Makefile.am                                    |    6 ++-
 NEWS                                           |    4 +
 configure.ac                                   |   15 +++-
 daemon/dbus/gkd-secret-unlock.c                |    6 +-
 pkcs11/rpc-layer/gkm-rpc-util.c                |    4 +-
 pkcs11/secret-store/gkm-secret-search.c        |   79 +++++++++++++----------
 pkcs11/secret-store/tests/test-secret-search.c |   73 ++++++++++++++++++++++
 7 files changed, 143 insertions(+), 44 deletions(-)
---
diff --cc Makefile.am
index bc89353,f419745..a843ca4
--- a/Makefile.am
+++ b/Makefile.am
@@@ -28,10 -38,13 +30,12 @@@ EXTRA_DIST = 
  
  DISTCHECK_CONFIGURE_FLAGS = \
  	--enable-gtk-doc \
 -	--enable-tests=full \
 -	--enable-debug=yes \
 -	--disable-gcov \
 +	--enable-strict \
 +	--disable-coverage \
  	--disable-update-mime \
- 	--with-pkcs11-modules=$(abs_srcdir)/$(top_distdir)/_inst/lib/
+ 	--with-pkcs11-modules=$(abs_srcdir)/$(top_distdir)/_inst/lib \
+ 	--with-pkcs11-config=$(abs_srcdir)/$(top_distdir)/_inst/etc/pkcs11 \
+ 	$(NULL)
  
  DISTCLEANFILES = \
  	intltool-extract \
diff --cc configure.ac
index c7097d8,32c4051..7e98ba3
--- a/configure.ac
+++ b/configure.ac
@@@ -271,11 -282,20 +271,16 @@@ AC_SUBST(DL_LIBS
  # --------------------------------------------------------------------
  # p11-kit
  
 -PKG_CHECK_MODULES([P11_KIT], p11-kit-1 >= 0.6)
 -AC_SUBST(P11_KIT_CFLAGS)
 -AC_SUBST(P11_KIT_LIBS)
 -
  AC_MSG_CHECKING([where to put pkcs11 module configuration])
- P11_SYSTEM_CONFIG_MODULES=$($PKG_CONFIG p11-kit-1 --variable=p11_system_config_modules)
- AC_MSG_RESULT($P11_SYSTEM_CONFIG_MODULES)
- AC_SUBST(P11_SYSTEM_CONFIG_MODULES)
- 
+ AC_ARG_WITH(pkcs11-config, [
+             AC_HELP_STRING([--with-pkcs11-config=<dir>],
+                            [directory to install PKCS#11 config])
+             ])
+ if test -z "$with_pkcs11_config" ; then
+ 	P11_SYSTEM_CONFIG_MODULES=$($PKG_CONFIG p11-kit-1 --variable=p11_system_config_modules)
+ else
+ 	P11_SYSTEM_CONFIG_MODULES="$with_pkcs11_config"
+ fi
  if test "$P11_SYSTEM_CONFIG_MODULES" = ""; then
  	AC_MSG_ERROR([Could not find location for pkcs11 module config])
  fi