summaryrefslogtreecommitdiff
path: root/meson_options.txt
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2018-09-07 16:54:07 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2018-09-13 14:35:14 +0200
commitf69cc378a3444f23c2ba7c99d8c2c2ddf51ba247 (patch)
tree6334263042fc11dcf2970bcff76596c2c8ff032c /meson_options.txt
parentd6e787d4c5d89c226b7c7f16f53753ca874e20e1 (diff)
build: remove check on dhcpcd version number
dhcpcd version 6, the first supporting IPv6, was released more than 5 years ago. Remove all checks on version number and IPv6 support. (cherry picked from commit e0c49d7341a0329e2c40e25fee5d3ce249f5ebe6)
Diffstat (limited to 'meson_options.txt')
-rw-r--r--meson_options.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/meson_options.txt b/meson_options.txt
index 73e0602c4..294c955a8 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -56,9 +56,8 @@ option('config_dns_rc_manager_default', type: 'combo', choices: ['symlink', 'fil
# dhcp clients
option('dhcpcanon', type: 'array', value: ['dhcpcanon', '/sbin/dhcpcanon', '/usr/sbin/dhcpcanon', '/usr/local/sbin/dhcpcanon', '/usr/bin/dhcpcanon', '/usr/local/bin/dhcpcanon'], description: 'Enable dhcpcanon support (experimental)')
option('dhclient', type: 'array', value: ['dhclient', '/sbin/dhclient', '/usr/sbin/dhclient', '/usr/local/sbin/dhclient'], description: 'Enable dhclient support')
-option('dhcpcd', type: 'array', value: ['dhcpcd', '/sbin/dhcpcd', '/usr/sbin/dhcpcd', '/usr/local/sbin/dhcpcd'], description: 'Enable dhcpcd 4.x support')
+option('dhcpcd', type: 'array', value: ['dhcpcd', '/sbin/dhcpcd', '/usr/sbin/dhcpcd', '/usr/local/sbin/dhcpcd'], description: 'Enable dhcpcd support')
option('config_dhcp_default', type: 'combo', choices: ['dhcpcanon', 'dhclient', 'dhcpcd', 'internal'], value: 'internal', description: 'Default configuration option for main.dhcp setting, used as fallback if the configuration option is unset')
-option('dhcpcd_supports_ipv6', type: 'boolean', value: true, description: 'Whether using dhcpcd >= 6.x which has IPv6 support')
# miscellaneous
option('introspection', type: 'boolean', value: true, description: 'Enable introspection for this build')