[patch tracking] 20201129205849773219 - 950d36f8ba
This commit is contained in:
parent
53a8c5c4cd
commit
acb0c41289
69
950d36f8ba5a669cbc34a7972db611b675725fb5.patch
Normal file
69
950d36f8ba5a669cbc34a7972db611b675725fb5.patch
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
diff --git a/meson.build b/meson.build
|
||||||
|
index aff75a2..7281ccb 100644
|
||||||
|
--- a/meson.build
|
||||||
|
+++ b/meson.build
|
||||||
|
@@ -40,8 +40,10 @@ localedir = join_paths(prefix, get_option('localedir'))
|
||||||
|
sbindir = join_paths(prefix, get_option('sbindir'))
|
||||||
|
|
||||||
|
systemd = dependency('systemd', required : false)
|
||||||
|
+install_systemd_units = systemd.found() or get_option('INSTALL_SYSTEMD_UNITS')
|
||||||
|
+
|
||||||
|
systemdunitdir = get_option('systemdunitdir')
|
||||||
|
-if systemdunitdir == '' and systemd.found()
|
||||||
|
+if systemdunitdir == '' and install_systemd_units
|
||||||
|
systemdunitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
|
||||||
|
endif
|
||||||
|
|
||||||
|
@@ -280,7 +282,7 @@ if build_rdisc == true
|
||||||
|
install_dir: sbindir,
|
||||||
|
link_with : [libcommon],
|
||||||
|
install: true)
|
||||||
|
- if systemd.found()
|
||||||
|
+ if install_systemd_units
|
||||||
|
subs = configuration_data()
|
||||||
|
subs.set('sbindir', sbindir)
|
||||||
|
unit_file = configure_file(
|
||||||
|
@@ -316,7 +318,7 @@ if build_rarpd == true
|
||||||
|
install_dir: sbindir,
|
||||||
|
link_with : [libcommon],
|
||||||
|
install: true)
|
||||||
|
- if systemd.found()
|
||||||
|
+ if install_systemd_units
|
||||||
|
subs = configuration_data()
|
||||||
|
subs.set('sbindir', sbindir)
|
||||||
|
unit_file = configure_file(
|
||||||
|
@@ -359,7 +361,7 @@ output += '\nCONFIGURATION\n'
|
||||||
|
output += 'Capatiblity (with libcap): ' + cap.to_string() + '\n'
|
||||||
|
output += 'IDN (with libidn2): ' + idn.to_string() + '\n'
|
||||||
|
output += 'I18N (with gettext): ' + gettext.to_string() + '\n'
|
||||||
|
-output += 'systemd: ' + systemd.found().to_string() + '\n'
|
||||||
|
+output += 'systemd: ' + install_systemd_units.to_string() + '\n'
|
||||||
|
|
||||||
|
output += '\nSYSTEM PATHS\n'
|
||||||
|
output += 'prefix: ' + prefix + '\n'
|
||||||
|
diff --git a/meson_options.txt b/meson_options.txt
|
||||||
|
index aade675..c806d80 100644
|
||||||
|
--- a/meson_options.txt
|
||||||
|
+++ b/meson_options.txt
|
||||||
|
@@ -64,5 +64,8 @@ option('ARPING_DEFAULT_DEVICE', type : 'string', value : '',
|
||||||
|
option('systemdunitdir', type: 'string', value: '',
|
||||||
|
description: 'Directory for systemd units')
|
||||||
|
|
||||||
|
+option('INSTALL_SYSTEMD_UNITS', type: 'boolean', value: false,
|
||||||
|
+ description: 'Install generated systemd unit files')
|
||||||
|
+
|
||||||
|
option('USE_GETTEXT', type: 'boolean', value: true,
|
||||||
|
description: 'Enable I18N')
|
||||||
|
diff --git a/ninfod/meson.build b/ninfod/meson.build
|
||||||
|
index 80b0a44..770169a 100644
|
||||||
|
--- a/ninfod/meson.build
|
||||||
|
+++ b/ninfod/meson.build
|
||||||
|
@@ -18,7 +18,7 @@ executable('ninfod', [ninfod_sources, git_version_h],
|
||||||
|
conf_data = configuration_data()
|
||||||
|
conf_data.set('prefix', prefix)
|
||||||
|
|
||||||
|
-if systemd.found()
|
||||||
|
+if install_systemd_units
|
||||||
|
subs = configuration_data()
|
||||||
|
subs.set('sbindir', sbindir)
|
||||||
|
unit_file = configure_file(
|
||||||
Loading…
x
Reference in New Issue
Block a user