Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build system related weaks #130

Merged
merged 3 commits into from
Nov 5, 2024
Merged

Build system related weaks #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd639ff
Update version in meson.build
cgzones Oct 30, 2024
1d295ff
Drop duplication from meson.build
cgzones Oct 30, 2024
60f9729
Print build feature relevant to netlogd in version
cgzones Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project('systemd-netlogd', 'c',
version : '1.4.1',
version : '1.4.2',
license : 'LGPL-2.1-or-later',
default_options: [
'c_std=gnu11',
Expand All @@ -13,11 +13,8 @@ project('systemd-netlogd', 'c',
conf = configuration_data()
conf.set_quoted('PACKAGE_VERSION', meson.project_version())
conf.set_quoted('PACKAGE_STRING', meson.project_name() + ' ' + meson.project_version())

substs = configuration_data()
substs.set('PACKAGE_URL', 'https://github.com/systemd/systemd-netlogd')
substs.set('PACKAGE_VERSION', meson.project_version())
substs.set('PKGPREFIX', get_option('prefix'))
conf.set('PACKAGE_URL', 'https://github.com/systemd/systemd-netlogd')
conf.set('PKGPREFIX', get_option('prefix'))
conf.set_quoted('PKGSYSCONFDIR', get_option('sysconfdir'))

#####################################################################
Expand Down Expand Up @@ -159,7 +156,7 @@ endif
systemd_netlogd_conf = configure_file(
input : 'conf/netlogd.conf.in',
output : 'netlogd.conf',
configuration : substs)
configuration : conf)
install_data(systemd_netlogd_conf,
install_dir : get_option('sysconfdir'))

Expand Down
6 changes: 5 additions & 1 deletion src/netlog/systemd-netlogd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,11 @@ static int parse_argv(int argc, char *argv[]) {

case ARG_VERSION:
puts(PACKAGE_STRING);
puts(SYSTEMD_FEATURES);
#ifdef HAVE_OPENSSL
puts("+OPENSSL");
#else
puts("-OPENSSL");
#endif
return 0;

case ARG_CURSOR:
Expand Down
2 changes: 1 addition & 1 deletion units/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
systemd_netlogd_conf = configure_file(
input : 'systemd-netlogd.service.in',
output : 'systemd-netlogd.service',
configuration : substs)
configuration : conf)
install_data(systemd_netlogd_conf,
install_dir : get_option('prefix') / 'system')