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

[Stefan Walter <stefw src gnome org>]

commit 0c592c29d85c1e7d73589cdc195d0d97dd11264a
Author: Stef Walter <stefw collabora co uk>
Date:   Mon Sep 26 07:24:41 2011 +0200

    Release version 3.2.0

 Makefile.am  |    3 ++-
 NEWS         |    4 ++++
 configure.ac |   21 ++++++++++++++-------
 3 files changed, 20 insertions(+), 8 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 3b8c7f5..57981f9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,8 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-tests=full \
 	--enable-debug=yes \
 	--disable-gcov \
-	--disable-update-mime
+	--disable-update-mime \
+	--with-pkcs11-modules=$(abs_srcdir)/$(top_distdir)/_inst/lib/
 
 DISTCLEANFILES = \
 	intltool-extract \
diff --git a/NEWS b/NEWS
index 8b71bad..ecb5b5a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Changes in version 3.2.0 are:
+ * Don't install setuid when filesystem capabilities not available
+ * Updated translations
+
 Changes in version 3.1.92 are:
  * Add back the file format "documentation"
  * Make .desktop file match prompt process so icon and title are shown
diff --git a/configure.ac b/configure.ac
index d00cf92..549c33e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_INIT(daemon/gkd-main.c)
 
-AM_INIT_AUTOMAKE(gnome-keyring, 3.1.92)
+AM_INIT_AUTOMAKE(gnome-keyring, 3.2.0)
 AM_CONFIG_HEADER(config.h)
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
@@ -295,14 +295,21 @@ if test "$P11_SYSTEM_CONFIG_MODULES" = ""; then
 	AC_MSG_ERROR([Could not find location for pkcs11 module config])
 fi
 
-AC_MSG_CHECKING([default module path for pkcs11 modules])
-P11_MODULE_PATH=$($PKG_CONFIG p11-kit-1 --variable=p11_module_path)
-AC_MSG_RESULT($P11_MODULE_PATH)
-AC_SUBST(P11_MODULE_PATH)
-
+AC_MSG_CHECKING([module path to install pkcs11 modules])
+AC_ARG_WITH(pkcs11-modules, [
+            AC_HELP_STRING([--with-pkcs11-modules=<dir>],
+                           [directory to install PKCS#11 modules])
+            ])
+if test -z "$with_pkcs11_modules" ; then
+	P11_MODULE_PATH=$($PKG_CONFIG p11-kit-1 --variable=p11_module_path)
+else
+	P11_MODULE_PATH="$with_pkcs11_modules"
+fi
 if test "$P11_MODULE_PATH" = ""; then
-	AC_MSG_ERROR([Could not find default path for pkcs11 modules])
+	AC_MSG_ERROR([Could not find directory to install pkcs11 modules])
 fi
+AC_MSG_RESULT($P11_MODULE_PATH)
+AC_SUBST(P11_MODULE_PATH)
 
 pkcs11standalonedir="${libdir}/gnome-keyring/devel"
 AC_SUBST(pkcs11standalonedir)