meson: rename option sytemd_unit_files to systemd_files

diff --git a/distro/arch/PKGBUILD b/distro/arch/PKGBUILD
index bb0cb497d7de0401ade5c8739605fe7da6b9006d..afa993945e8cae04aa2ba18d856b79066e999c81 100644 (file)
--- a/distro/arch/PKGBUILD
+++ b/distro/arch/PKGBUILD
@@ -40,7 +40,7 @@ build() {
         --prefix=/usr \
         --sbindir=bin \
         -Dkeyfile_default=/etc/trusted-key.key \
-        -Dsystemd_unit_files=enabled \
+        -Dsystemd_files=enabled \
         -Dclient=enabled \
         -Dinstall_kresd_conf=enabled \
         -Dunit_tests=enabled

diff --git a/distro/deb/rules b/distro/deb/rules
index f0a3d7e275a3f69b23b399066a8846f9909c2e8d..1287cd02d769a63c829bfbc74ef5905112432187 100755 (executable)
--- a/distro/deb/rules
+++ b/distro/deb/rules
@@ -24,7 +24,7 @@ override_dh_auto_build:
                --prefix=/usr \
                --libdir=lib \
                -Ddoc=enabled \
-               -Dsystemd_unit_files=enabled \
+               -Dsystemd_files=enabled \
                -Dclient=enabled \
                -Dkeyfile_default=/usr/share/dns/root.key \
                -Droot_hints=/usr/share/dns/root.hints \

diff --git a/distro/rpm/knot-resolver.spec b/distro/rpm/knot-resolver.spec
index 486bfd3a24c784cc224afb31afc75c15796ca567..7b971a93d4bb6fd4366a360622eb91462e97f91b 100644 (file)
--- a/distro/rpm/knot-resolver.spec
+++ b/distro/rpm/knot-resolver.spec
@@ -122,9 +122,9 @@ gpg2 --verify %{SOURCE1} %{SOURCE0}
 CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" meson build_rpm \
 %if "x%{?rhel}" == "x"
     -Ddoc=enabled \
-    -Dsystemd_unit_files=enabled \
+    -Dsystemd_files=enabled \
 %else
-    -Dsystemd_unit_files=nosocket \
+    -Dsystemd_files=nosocket \
 %endif
     -Dclient=enabled \
     -Dunit_tests=enabled \

diff --git a/doc/build.rst b/doc/build.rst
index 70b5562f8c0a5b9b190fc2de3b597350ff62e6b6..523312ed1b823b57c15a9bcea4003d08d8618f2b 100644 (file)
--- a/doc/build.rst
+++ b/doc/build.rst
@@ -260,9 +260,9 @@ unit files themselves.
 
 Depending on your systemd version, choose the appropriate build option:
 
-* ``-Dsystemd_unit_files=enabled`` (recommended) installs unit files with
+* ``-Dsystemd_files=enabled`` (recommended) installs unit files with
   systemd socket activation support. Requires systemd >=227.
-* ``-Dsystemd_unit_files=nosocket`` for systemd <227. Unit files won't use
+* ``-Dsystemd_files=nosocket`` for systemd <227. Unit files won't use
   socket activation.
 
 To support enabling services after boot, you must also link ``kresd.target`` to

diff --git a/doc/meson.build b/doc/meson.build
index 45143fd0855b9ac8713b4c57b33e36ba6644a78b..a650d6e9d8d8d96dcd5ff96942a60fc4f456883c 100644 (file)
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -7,9 +7,9 @@ man_config.set('date', run_command('../scripts/get-date.sh').stdout())
 man_config.set('keyfile_default', keyfile_default)
 
 man_config.set('man_seealso_systemd', '')
-if systemd_unit_files == 'enabled'
+if systemd_files == 'enabled'
   man_config.set('man_seealso_systemd', '\\fIkresd.systemd(7)\\fR, ')
-elif systemd_unit_files == 'nosocket'
+elif systemd_files == 'nosocket'
   man_config.set('man_seealso_systemd', '\\fIkresd.systemd.nosocket(7)\\fR, ')
 endif
 

diff --git a/etc/config/meson.build b/etc/config/meson.build
index be18cb8a3ed7931c934654b23539e4daa3a8ec77..b13aa77e3352ce3ea58d4aa4b0e99eb2486cb55a 100644 (file)
--- a/etc/config/meson.build
+++ b/etc/config/meson.build
@@ -1,7 +1,7 @@
 # etc: config examples
 
 # Config snippets (build-dependant)
-if systemd_unit_files == 'enabled'
+if systemd_files == 'enabled'
   config_defaults = '''
 -- Network interface configuration: see kresd.systemd(7)'''
 else

diff --git a/meson.build b/meson.build
index b32cf1fabb2c9a458414a9d9b6f9f263cd7e2436..87fb993a61085c2ba4aa9af61a07b2aed19ec7fa 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -77,9 +77,9 @@ group = get_option('group')
 ## Systemd
 message('--- systemd socket activation ---')
 libsystemd = dependency('libsystemd', version: '>=227', required: false)
-systemd_unit_files = get_option('systemd_unit_files')
-if systemd_unit_files == 'enabled' and not libsystemd.found()
-  error('systemd_unit_files=enabled requires libsystemd >= 227')
+systemd_files = get_option('systemd_files')
+if systemd_files == 'enabled' and not libsystemd.found()
+  error('systemd_files=enabled requires libsystemd >= 227')
 endif
 message('---------------------------')
 
@@ -162,7 +162,7 @@ subdir('etc')
 
 
 # Systemd unit files
-if systemd_unit_files != 'disabled'
+if systemd_files != 'disabled'
   subdir('systemd')
 endif
 
@@ -253,7 +253,7 @@ message('''
 
   systemd:
     socket activation:  @0@'''.format(s_systemd_socket) + '''
-    unit_files:         @0@'''.format(systemd_unit_files) + '''
+    files:              @0@'''.format(systemd_files) + '''
     work_dir:           @0@'''.format(systemd_work_dir) + '''
 
   optional components

diff --git a/meson_options.txt b/meson_options.txt
index c1308cacc4238ec1cf4ab464aab9496cc5ac6776..3d52602968589e3bb63799344be5a591db9df5b3 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -65,7 +65,7 @@ option(
 
 ## Systemd
 option(
-  'systemd_unit_files',
+  'systemd_files',
   type: 'combo',
   choices: [
     'disabled',
@@ -73,7 +73,7 @@ option(
     'nosocket',
   ],
   value: 'disabled',
-  description: 'installs systemd unit files',
+  description: 'installs systemd-related files',
 )
 
 

diff --git a/systemd/meson.build b/systemd/meson.build
index 60103c716705a33f5b83bcd21352f43d99158972..d013ae2913d140623df56b71fbb84512f836afc7 100644 (file)
--- a/systemd/meson.build
+++ b/systemd/meson.build
@@ -16,7 +16,7 @@ systemd_config.set('sbin_dir', sbin_dir)
 systemd_config.set('etc_dir', etc_dir)
 systemd_config.set('run_dir', run_dir)
 
-if systemd_unit_files == 'enabled'
+if systemd_files == 'enabled'
   ## unit files
   kresd_service = configure_file(
     input: 'kresd@.service.in',
@@ -70,6 +70,6 @@ if systemd_unit_files == 'enabled'
     ],
     install_dir: join_paths(examples_dir, 'kresd-tls.socket.d'),
   )
-elif systemd_unit_files == 'nosocket'
+elif systemd_files == 'nosocket'
   subdir('nosocket')
 endif