[network-manager-applet/lr/pkcs11: 8/14] XXX gcr

[Lubomir Rintel <lkundrak src gnome org>]

commit f2efef5a8cd65469739035f3badc410aaa0ef0f0
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Sun Feb 19 13:14:52 2017 +0000

    XXX gcr

 Makefile.am  |    8 ++++++--
 configure.ac |   12 ++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 6bf4eba..75dae23 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -522,13 +522,17 @@ src_libnma_libnma_la_CFLAGS = \
        "-I$(srcdir)/src/libnma" \
        $(GTK_CFLAGS) \
        $(LIBNM_CFLAGS) \
-       $(GUDEV_CFLAGS)
+       $(GUDEV_CFLAGS) \
+       $(GCR_CFLAGS) \
+       -DGCR_API_SUBJECT_TO_CHANGE \
+       -DGCK_API_SUBJECT_TO_CHANGE
 
 src_libnma_libnma_la_LIBADD = \
        src/wireless-security/libwireless-security-libnm.la \
        $(GTK_LIBS) \
        $(LIBNM_LIBS) \
-       $(GUDEV_LIBS)
+       $(GUDEV_LIBS) \
+       $(GCR_LIBS)
 
 $(src_libnma_libnma_la_OBJECTS): $(libnma_h_priv_gen)
 
diff --git a/configure.ac b/configure.ac
index a390dc7..23ca0b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -144,6 +144,18 @@ else
 fi
 AM_CONDITIONAL(WITH_JANSSON, test "${with_team}" != "no")
 
+dnl Gcr for PKCS#11 certificate picker
+AC_ARG_WITH(gcr, AS_HELP_STRING([--with-gcr], [Enable PKCS#11 certificate chooser (default: yes)]))
+if (test "${with_gcr}" == "no"); then
+    AC_DEFINE(WITH_GCR, 0, [Define if Gcr is available])
+else
+    PKG_CHECK_MODULES(GCR,
+                      [gcr-3 >= 3.20, gck-1 >= 3.20],,
+                      AC_MSG_ERROR([gcr is needed for certificate chooser. Use --without-gcr to build 
without it.]))
+    AC_DEFINE(WITH_GCR, 1, [Define if Gcr is available])
+fi
+AM_CONDITIONAL(WITH_GCR, test "${with_gcr}" != "no")
+
 dnl Check for gobject introspection
 GOBJECT_INTROSPECTION_CHECK([0.9.6])