RECLAIM: Improve OIDC plugin; now requires jose (new optional dependency)

3 files changed, 9 insertions, 4 deletions

diff --git a/README b/README
index 9afd57043..7c4dfe8c0 100644
--- a/README
+++ b/README
@@ -147,7 +147,8 @@ Dependencies of optional components/functionality:
 - PABC credential support
   * libpabc            any            (for re:claimID zero-knowledge privacy
                                       credentials)
-
+- re:claimID OpenID Connect plugin
+  * libjose            any            (for re:claimID OpenID Connect support)
 
 
 Additional dependencies to run the GNUnet testsuite:
diff --git a/configure.ac b/configure.ac
index 3553d93b9..c34e2a70e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -722,7 +722,7 @@ AS_IF([test "x$jansson" = "x0"],
 # check for jose
 CHECK_WITH_LIB([jose], [jose_jwk_gen], [jose/jose.h], [HAVE_JOSE])
 AS_IF([test "x$jose" = "x0"],
-  [AC_MSG_ERROR([GNUnet requires jose])])
+  [AC_MSG_WARN([reclaimID OpenID Connect plugin requires jose])])
 
 # check for libpulse (pulseaudio)
 CHECK_WITH_LIB([pulse], [pa_stream_peek], [pulse/simple.h], [HAVE_PULSE])
diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am
index 710207d8b..2f3df3456 100644
--- a/src/reclaim/Makefile.am
+++ b/src/reclaim/Makefile.am
@@ -10,9 +10,12 @@ endif
 
 
 REST_PLUGIN = \
-  libgnunet_plugin_rest_openid_connect.la \
   libgnunet_plugin_rest_reclaim.la
 
+if HAVE_JOSE
+REST_PLUGIN += libgnunet_plugin_rest_openid_connect.la
+endif
+
 CREDENTIAL_PLUGIN = \
   libgnunet_plugin_reclaim_credential_jwt.la
 
@@ -66,7 +69,7 @@ libgnunet_plugin_rest_reclaim_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS)
 libgnunet_plugin_rest_reclaim_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
 
-
+if HAVE_JOSE
 libgnunet_plugin_rest_openid_connect_la_SOURCES = \
   plugin_rest_openid_connect.c \
   oidc_helper.h \
@@ -84,6 +87,7 @@ libgnunet_plugin_rest_openid_connect_la_LIBADD = \
 libgnunet_plugin_rest_openid_connect_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS)
 libgnunet_plugin_rest_openid_connect_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
+endif
 
 if HAVE_PABC
 libgnunet_plugin_rest_pabc_la_SOURCES = \