Merge pull request #130 from cgzones/release

Build system related weaks
systemd · Nov 5, 2024 · 085384d · 085384d
2 parents ca76343 + 60f9729
commit 085384d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/meson.build b/meson.build
@@ -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',
@@ -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'))
 
 #####################################################################
@@ -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'))
 

diff --git a/src/netlog/systemd-netlogd.c b/src/netlog/systemd-netlogd.c
@@ -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:

diff --git a/units/meson.build b/units/meson.build
@@ -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')