[gnunet] branch master updated: REST: Fix compilation without jose

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new baf5b12e7 REST: Fix compilation without jose
     new 27d840626 Merge branch 'master' of git+ssh://git.gnunet.org/gnunet
baf5b12e7 is described below

commit baf5b12e7b6e5918895a71ace1c5217cb0f21637
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Tue Oct 24 21:28:49 2023 +0200

    REST: Fix compilation without jose
---
 src/service/rest/gnunet-rest-server.c | 8 ++++----
 src/service/rest/meson.build          | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/service/rest/gnunet-rest-server.c 
b/src/service/rest/gnunet-rest-server.c
index ce81704ae..7cc4025b0 100644
--- a/src/service/rest/gnunet-rest-server.c
+++ b/src/service/rest/gnunet-rest-server.c
@@ -34,7 +34,7 @@
 #include "identity_plugin.h"
 #include "namestore_plugin.h"
 #include "gns_plugin.h"
-#ifdef HAVE_JOSE
+#if HAVE_JOSE
 #include "openid_plugin.h"
 #endif
 #include "reclaim_plugin.h"
@@ -265,7 +265,7 @@ struct GNUNET_REST_Plugin *copying_plugin;
 struct GNUNET_REST_Plugin *identity_plugin;
 struct GNUNET_REST_Plugin *namestore_plugin;
 struct GNUNET_REST_Plugin *gns_plugin;
-#ifdef HAVE_JOSE
+#if HAVE_JOSE
 struct GNUNET_REST_Plugin *openid_plugin;
 #endif
 struct GNUNET_REST_Plugin *reclaim_plugin;
@@ -1020,7 +1020,7 @@ do_shutdown (void *cls)
   REST_copying_done (copying_plugin);
   REST_identity_done (identity_plugin);
   REST_gns_done (gns_plugin);
-#ifdef HAVE_JOSE
+#if HAVE_JOSE
   REST_openid_done (openid_plugin);
 #endif
   REST_reclaim_done (reclaim_plugin);
@@ -1403,7 +1403,7 @@ run (void *cls,
   {
     GNUNET_SCHEDULER_shutdown ();
   }
-#ifdef HAVE_JOSE
+#if HAVE_JOSE
   struct GNUNET_REST_Plugin *openid_plugin = REST_openid_init (cfg);
   if (GNUNET_OK != setup_plugin (openid_plugin->name, 
&REST_openid_process_request, openid_plugin))
   {
diff --git a/src/service/rest/meson.build b/src/service/rest/meson.build
index 347cbb852..1ccb89796 100644
--- a/src/service/rest/meson.build
+++ b/src/service/rest/meson.build
@@ -6,12 +6,14 @@ gnunetservicerest_src = ['gnunet-rest-server.c',
                          'identity_plugin.c',
                          'namestore_plugin.c',
                          'gns_plugin.c',
-                         'openid_plugin.c',
-                         'oidc_helper.c',
                          'json_reclaim.c',
                          'reclaim_plugin.c',
                          ]
 
+if jose_dep.found()
+  gnunetservicerest_src += ['oidc_helper.c', 'openid_plugin.c']
+endif
+
 configure_file(input : 'rest.conf',
                output : 'rest.conf',
                configuration : cdata,

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.