diff options
Diffstat (limited to 'src/journal-remote')
| -rw-r--r-- | src/journal-remote/journal-gatewayd.c | 2 | ||||
| -rw-r--r-- | src/journal-remote/journal-remote.c | 4 | ||||
| -rw-r--r-- | src/journal-remote/meson.build | 4 | ||||
| -rw-r--r-- | src/journal-remote/microhttpd-util.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c index 63261bfa6c..a0f1f3e926 100644 --- a/src/journal-remote/journal-gatewayd.c +++ b/src/journal-remote/journal-gatewayd.c @@ -946,7 +946,7 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_TRUST: -#ifdef HAVE_GNUTLS +#if HAVE_GNUTLS if (arg_trust_pem) { log_error("CA certificate file specified twice"); return -EINVAL; diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index 64b1105901..9f51137645 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -1384,7 +1384,7 @@ static int parse_argv(int argc, char *argv[]) { if (streq(optarg, "all")) arg_trust_all = true; else { -#ifdef HAVE_GNUTLS +#if HAVE_GNUTLS arg_trust = strdup(optarg); if (!arg_trust) return log_oom(); @@ -1442,7 +1442,7 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_GNUTLS_LOG: { -#ifdef HAVE_GNUTLS +#if HAVE_GNUTLS const char* p = optarg; for (;;) { _cleanup_free_ char *word = NULL; diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build index d266b34e65..ed963d7930 100644 --- a/src/journal-remote/meson.build +++ b/src/journal-remote/meson.build @@ -21,7 +21,7 @@ systemd_journal_gatewayd_sources = files(''' microhttpd-util.c '''.split()) -if conf.get('ENABLE_REMOTE', false) and conf.get('HAVE_LIBCURL', false) +if conf.get('ENABLE_REMOTE') ==1 and conf.get('HAVE_LIBCURL') == 1 journal_upload_conf = configure_file( input : 'journal-upload.conf.in', output : 'journal-upload.conf', @@ -30,7 +30,7 @@ if conf.get('ENABLE_REMOTE', false) and conf.get('HAVE_LIBCURL', false) install_dir : pkgsysconfdir) endif -if conf.get('ENABLE_REMOTE', false) and conf.get('HAVE_MICROHTTPD', false) +if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1 journal_remote_conf = configure_file( input : 'journal-remote.conf.in', output : 'journal-remote.conf', diff --git a/src/journal-remote/microhttpd-util.c b/src/journal-remote/microhttpd-util.c index f5d2d7967a..75c14ec996 100644 --- a/src/journal-remote/microhttpd-util.c +++ b/src/journal-remote/microhttpd-util.c @@ -22,7 +22,7 @@ #include <stdio.h> #include <string.h> -#ifdef HAVE_GNUTLS +#if HAVE_GNUTLS #include <gnutls/gnutls.h> #include <gnutls/x509.h> #endif @@ -115,7 +115,7 @@ int mhd_respondf(struct MHD_Connection *connection, return mhd_respond_internal(connection, code, m, r, MHD_RESPMEM_MUST_FREE); } -#ifdef HAVE_GNUTLS +#if HAVE_GNUTLS static struct { const char *const names[4]; |