diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2018-09-07 16:54:07 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2018-09-13 14:35:14 +0200 |
| commit | b66607af957e5beb8ffa063303bb8ab692a5fd05 (patch) | |
| tree | 6334263042fc11dcf2970bcff76596c2c8ff032c /meson_options.txt | |
| parent | 365482bf5ec536e8b89f645a16de371aee50c6f9 (diff) | |
| download | NetworkManager-b66607af957e5beb8ffa063303bb8ab692a5fd05.tar.gz | |
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.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/meson_options.txt b/meson_options.txt index 73e0602c4f..294c955a83 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') |