[gnome-keyring] Link directly to gmodule for the modules that need it

[Stefan Walter <stefw src gnome org>]

commit ac01c60ed77e7360ee1ba5160e02bbae234dd984
Author: Sjoerd Simons <sjoerd simons collabora co uk>
Date:   Sat Dec 25 17:59:39 2010 +0100

    Link directly to gmodule for the modules that need it

 configure.in                    |    4 ++++
 pkcs11/roots-store/Makefile.am  |    7 +++++--
 pkcs11/secret-store/Makefile.am |    4 +++-
 pkcs11/ssh-store/Makefile.am    |    4 +++-
 pkcs11/xdg-store/Makefile.am    |    4 +++-
 5 files changed, 18 insertions(+), 5 deletions(-)
---
diff --git a/configure.in b/configure.in
index 13a9018..30aa88f 100644
--- a/configure.in
+++ b/configure.in
@@ -69,6 +69,10 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16.0)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
+PKG_CHECK_MODULES(GMODULE, gmodule-no-export-2.0)
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
+
 PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.8.0)
 AC_SUBST(GTHREAD_CFLAGS)
 AC_SUBST(GTHREAD_LIBS)
diff --git a/pkcs11/roots-store/Makefile.am b/pkcs11/roots-store/Makefile.am
index 1e507ca..034a463 100644
--- a/pkcs11/roots-store/Makefile.am
+++ b/pkcs11/roots-store/Makefile.am
@@ -5,7 +5,9 @@ INCLUDES = \
     	-I$(top_srcdir)/pkcs11 \
     	$(GOBJECT_CFLAGS) \
 	$(LIBGCRYPT_CFLAGS) \
-	$(GLIB_CFLAGS)
+	$(GLIB_CFLAGS) \
+	$(GMODULE_CFLAGS)
+
 
 
 # ------------------------------------------------------------------------------
@@ -41,7 +43,8 @@ gkm_roots_store_standalone_la_LIBADD = \
 	$(GOBJECT_LIBS) \
 	$(GTHREAD_LIBS) \
 	$(GLIB_LIBS) \
-	$(LIBGCRYPT_LIBS)
+	$(LIBGCRYPT_LIBS) \
+	$(GMODULE_LIBS)
 
 
 # -------------------------------------------------------------------------------
diff --git a/pkcs11/secret-store/Makefile.am b/pkcs11/secret-store/Makefile.am
index 1a6008c..3bb3e89 100644
--- a/pkcs11/secret-store/Makefile.am
+++ b/pkcs11/secret-store/Makefile.am
@@ -4,7 +4,8 @@ INCLUDES = \
     	-I$(top_srcdir) \
     	-I$(top_srcdir)/pkcs11 \
     	$(GOBJECT_CFLAGS) \
-	$(GLIB_CFLAGS)
+	$(GLIB_CFLAGS) \
+	$(GMODULE_CFLAGS)
 
 # ------------------------------------------------------------------------------
 # The secret store component code
@@ -47,6 +48,7 @@ gkm_secret_store_standalone_la_LIBADD = \
 	$(GOBJECT_LIBS) \
 	$(GTHREAD_LIBS) \
 	$(GLIB_LIBS) \
+	$(GMODULE_LIBS) \
 	$(LIBGCRYPT_LIBS)
 
 # -------------------------------------------------------------------------------
diff --git a/pkcs11/ssh-store/Makefile.am b/pkcs11/ssh-store/Makefile.am
index 3626a44..811c8d4 100644
--- a/pkcs11/ssh-store/Makefile.am
+++ b/pkcs11/ssh-store/Makefile.am
@@ -5,7 +5,8 @@ INCLUDES = \
     	-I$(top_srcdir)/pkcs11 \
     	$(GOBJECT_CFLAGS) \
 	$(LIBGCRYPT_CFLAGS) \
-	$(GLIB_CFLAGS)
+	$(GLIB_CFLAGS) \
+	$(GMODULE_CFLAGS)
 
 
 # ------------------------------------------------------------------------------
@@ -42,6 +43,7 @@ gkm_ssh_store_standalone_la_LIBADD = \
 	$(GOBJECT_LIBS) \
 	$(GTHREAD_LIBS) \
 	$(GLIB_LIBS) \
+	$(GMODULE_LIBS) \
 	$(LIBGCRYPT_LIBS)
 
 
diff --git a/pkcs11/xdg-store/Makefile.am b/pkcs11/xdg-store/Makefile.am
index 25c092a..4bdce1f 100644
--- a/pkcs11/xdg-store/Makefile.am
+++ b/pkcs11/xdg-store/Makefile.am
@@ -5,7 +5,8 @@ INCLUDES = \
 	-I$(top_srcdir)/pkcs11 \
 	$(GOBJECT_CFLAGS) \
 	$(LIBGCRYPT_CFLAGS) \
-	$(GLIB_CFLAGS)
+	$(GLIB_CFLAGS) \
+	$(GMODULE_CFLAGS)
 
 # ------------------------------------------------------------------------------
 # The xdg-store component code
@@ -50,6 +51,7 @@ gkm_xdg_store_standalone_la_LIBADD = \
 	$(GOBJECT_LIBS) \
 	$(GTHREAD_LIBS) \
 	$(GLIB_LIBS) \
+	$(GMODULE_LIBS) \
 	$(LIBGCRYPT_LIBS)