[gnome-keyring/gnome-3-2] Release version 3.2.1

[Stefan Walter <stefw src gnome org>]

commit 6d58181fcddc5c13762a1920a464787ebc27d4bc
Author: Stef Walter <stefw collabora co uk>
Date:   Mon Oct 17 22:29:21 2011 +0200

    Release version 3.2.1

 Makefile.am  |    6 +++++-
 NEWS         |    4 ++++
 configure.ac |   17 ++++++++++++-----
 3 files changed, 21 insertions(+), 6 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 57981f9..f419745 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
 if WITH_PAM
 PAM_DIR = pam
 else
@@ -40,7 +42,9 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-debug=yes \
 	--disable-gcov \
 	--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 --git a/NEWS b/NEWS
index ecb5b5a..ff5625b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Changes in version 3.2.1 are:
+ * Fix debugging output, and erroneous warnings
+ * Updated translations
+
 Changes in version 3.2.0 are:
  * Don't install setuid when filesystem capabilities not available
  * Updated translations
diff --git a/configure.ac b/configure.ac
index 549c33e..32c4051 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_INIT(daemon/gkd-main.c)
 
-AM_INIT_AUTOMAKE(gnome-keyring, 3.2.0)
+AM_INIT_AUTOMAKE(gnome-keyring, 3.2.1)
 AM_CONFIG_HEADER(config.h)
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
@@ -287,13 +287,20 @@ 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
+AC_MSG_RESULT($P11_SYSTEM_CONFIG_MODULES)
+AC_SUBST(P11_SYSTEM_CONFIG_MODULES)
 
 AC_MSG_CHECKING([module path to install pkcs11 modules])
 AC_ARG_WITH(pkcs11-modules, [