diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-05-16 10:21:58 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-05-31 13:04:18 +0200 |
| commit | c064d8db402de0c0d609aabcfc722750856a1f01 (patch) | |
| tree | 8b0b9345e8e706702e8c354d5f828e011eb2b85a /meson.build | |
| parent | journal: rewrap function args (diff) | |
| download | systemd-c064d8db402de0c0d609aabcfc722750856a1f01.tar.xz systemd-c064d8db402de0c0d609aabcfc722750856a1f01.zip | |
journal-remote: split out µhttpd support and main() into a separate file
This is in preparation to reusing the RemoteServer in other concepts.
I tried to keep changes to minimum:
- arg_* global variables are now passed as state in RemoteServer
- exported functions get the "journal_remote_" prefix
- some variables are renamed
In particular, there is an ugly global RemoveServer* variable. It was originally
added because µhttpd did not allow state to be passed to the callbacks. I'm not
sure if this has been remediated in µhttpd, but either way, this is not changed
here, the global variable is only renamed for clarity.
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 83fed46cc7..ac1db5319d 100644 --- a/meson.build +++ b/meson.build @@ -2007,7 +2007,8 @@ if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1 s_j_remote = executable('systemd-journal-remote', systemd_journal_remote_sources, include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libsystemd_journal_remote], dependencies : [threads, libmicrohttpd, libgnutls, |