summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSami Kerola <kerolasa@iki.fi>2017-12-31 13:04:34 +0000
committerSami Kerola <kerolasa@iki.fi>2018-10-03 20:21:36 +0100
commitcd4ee59633bf5ed783b021080c6dc9637fbf17f0 (patch)
tree56575cb1fd58bfdc9284d93054e057f7fb9056db
parent4f4bec7b125d383646fe83e1735aadd7b3743253 (diff)
downloadiputils-cd4ee59633bf5ed783b021080c6dc9637fbf17f0.tar.gz
rdisc: enable rdisc server by default
For some reason this was overlooked when meson build improvements happen. Signed-off-by: Sami Kerola <kerolasa@iki.fi>
-rw-r--r--meson.build7
-rw-r--r--meson_options.txt3
2 files changed, 10 insertions, 0 deletions
diff --git a/meson.build b/meson.build
index b063934..54fdc71 100644
--- a/meson.build
+++ b/meson.build
@@ -96,6 +96,13 @@ build_traceroute6 = get_option('BUILD_TRACEROUTE6')
build_mans = get_option('BUILD_MANS')
+if build_rinfod == true
+ opt = get_option('ENABLE_RDISC_SERVER')
+ if opt == true
+ conf.set('RDISC_SERVER', 1, description : 'If set build rdisc server.')
+ endif
+endif
+
build_ninfod = get_option('BUILD_NINFOD')
if build_ninfod == true
if cc.has_header('stdio.h') and cc.has_header('stdlib.h') and cc.has_header('stddef.h')
diff --git a/meson_options.txt b/meson_options.txt
index e6a577f..3cb3dcc 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -22,6 +22,9 @@ option('BUILD_RARPD', type : 'boolean', value : true,
option('BUILD_RDISC', type : 'boolean', value : true,
description : 'Build rinfod')
+option('ENABLE_RDISC_SERVER', type : 'boolean', value : true,
+ description : 'Enable rinfod server code')
+
option('BUILD_TFTPD', type : 'boolean', value : true,
description : 'Build tftpd')