[gnome-keyring/mjog/reinstate-p11kit-module] Revert "pkcs11: Don't install p11-kit module configuration"

[Michael Gratton <mjog src gnome org>]

commit a955ae82a9828ec115bc6fadd56abe00bc49f3ae
Author: Michael James Gratton <mike vee net>
Date:   Tue Dec 25 00:51:22 2018 +1030

    Revert "pkcs11: Don't install p11-kit module configuration"
    
    This reverts commit 5d8326eaf1ebce1cde2ee797c03f261da3159aae.
    
    Fixes #20

 .gitignore                               | 3 +++
 configure.ac                             | 1 +
 pkcs11/rpc-layer/Makefile.am             | 5 +++++
 pkcs11/rpc-layer/gnome-keyring.module.in | 7 +++++++
 4 files changed, 16 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index 106e9df2..f153d290 100644
--- a/.gitignore
+++ b/.gitignore
@@ -146,6 +146,9 @@ depcomp
 /pkcs11/gnome2-store/tests/check-gnome2-module
 /pkcs11/gnome2-store/tests/check-module
 
+/pkcs11/rpc-layer/gnome-keyring-module
+/pkcs11/rpc-layer/gnome-keyring.module
+
 /pkcs11/secret-store/tests/test-secret-binary
 /pkcs11/secret-store/tests/test-secret-collection
 /pkcs11/secret-store/tests/test-secret-compat
diff --git a/configure.ac b/configure.ac
index a240536e..5572752d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -649,6 +649,7 @@ AC_SUBST(P11_TESTS_LIBS)
 
 AC_OUTPUT([
 Makefile
+pkcs11/rpc-layer/gnome-keyring.module
 po/Makefile.in
 ])
 
diff --git a/pkcs11/rpc-layer/Makefile.am b/pkcs11/rpc-layer/Makefile.am
index c6443d67..ccdff919 100644
--- a/pkcs11/rpc-layer/Makefile.am
+++ b/pkcs11/rpc-layer/Makefile.am
@@ -45,6 +45,11 @@ gnome_keyring_pkcs11_la_LDFLAGS = \
        -module -avoid-version \
        -no-undefined -export-symbols-regex 'C_GetFunctionList'
 
+# This is the configuration file that p11-kit uses to load the module
+pkcs11configdir = $(P11_SYSTEM_CONFIG_MODULES)
+pkcs11config_DATA = \
+       pkcs11/rpc-layer/gnome-keyring.module
+
 # -----------------------------------------------------------------------------
 # The tests
 
diff --git a/pkcs11/rpc-layer/gnome-keyring.module.in b/pkcs11/rpc-layer/gnome-keyring.module.in
new file mode 100644
index 00000000..3ee20181
--- /dev/null
+++ b/pkcs11/rpc-layer/gnome-keyring.module.in
@@ -0,0 +1,7 @@
+
+# The file is installed/loaded from the default module p11-kit directory
+module: gnome-keyring-pkcs11.so
+
+# And where to store and lookup trust objects
+x-trust-store: pkcs11:library-manufacturer=GNOME%20Keyring;serial=1:XDG:DEFAULT
+x-trust-lookup: pkcs11:library-manufacturer=GNOME%20Keyring