Commit 73249e2e authored by Beniamino Galvani's avatar Beniamino Galvani

build: meson: uniform handling of dhcp client paths

Handle all dhcp client paths through the same code.

(cherry picked from commit 36b0e461)
parent 4fd66231
......@@ -539,58 +539,39 @@ config_h.set10('WITH_BLUEZ5_DUN', enable_bluez5_dun)
enable_ofono = get_option('ofono')
config_h.set10('WITH_OFONO', enable_ofono)
# DHCP client support with dhcpcanon
locations = get_option('dhcpcanon')
enable_dhcpcanon = (locations != ['no'])
if enable_dhcpcanon
dhcpcanon = find_program(locations, required: false)
enable_dhcpcanon = dhcpcanon.found()
if enable_dhcpcanon
config_h.set_quoted('DHCPCANON_PATH', dhcpcanon.path())
endif
endif
config_h.set10('WITH_DHCPCANON', enable_dhcpcanon)
# DHCP client support
locations = get_option('dhclient')
enable_dhclient = (locations != ['no'])
if enable_dhclient
dhclient = find_program(locations, required: false)
enable_dhclient = dhclient.found()
if enable_dhclient
config_h.set_quoted('DHCLIENT_PATH', dhclient.path())
endif
endif
config_h.set10('WITH_DHCLIENT', enable_dhclient)
locations = get_option('dhcpcd')
enable_dhcpcd = (locations != ['no'])
if enable_dhcpcd
dhcpcd = find_program(locations, required: false)
enable_dhcpcd = dhcpcd.found()
if enable_dhcpcd
config_h.set_quoted('DHCPCD_PATH', dhcpcd.path())
endif
endif
config_h.set10('WITH_DHCPCD', enable_dhcpcd)
config_dhcp_default = get_option('config_dhcp_default')
if config_dhcp_default == 'dhcpcanon' and not enable_dhcpcanon
error(config_dhcp_default + ' has not been enabled. Please don\'t disable it or use another configuration option for main.dhcp setting')
endif
if config_dhcp_default == 'dhclient' and not enable_dhclient
error(config_dhcp_default + ' has not been enabled. Please don\'t disable it or use another configuration option for main.dhcp setting')
endif
if config_dhcp_default == 'dhcpcd' and not enable_dhcpcd
error(config_dhcp_default + ' has not been enabled. Please don\'t disable it or use another configuration option for main.dhcp setting')
endif
config_h.set_quoted('NM_CONFIG_DEFAULT_MAIN_DHCP', config_dhcp_default)
dhcp_summary = ''
foreach client : [ 'dhclient', 'dhcpcd', 'dhcpcanon' ]
client_path = get_option(client)
client_enable = (client_path != 'no')
if client_enable
if client_path == ''
client_prog = find_program(client,
'/sbin/' + client,
'/usr/sbin/pppd/' + client,
'/usr/local/sbin/' + client,
required : false)
if client_prog.found()
client_path = client_prog.path()
else
client_path = '/usr/sbin/' + client
message('@0@ not found, assume path @1@'.format(client, client_path))
endif
endif
config_h.set_quoted(client.to_upper() + '_PATH', client_path)
endif
if config_dhcp_default == client and not client_enable
error(client + ' has not been enabled. Please don\'t disable it or use another configuration option for main.dhcp setting')
endif
config_h.set10('WITH_' + client.to_upper(), client_enable)
dhcp_summary += (' ' + client + ': ' + client_enable.to_string())
if (client_enable)
dhcp_summary += (' ' + client_path)
endif
dhcp_summary += '\n'
endforeach
# OpenVSwitch integration
enable_ovs = get_option('ovs')
......@@ -982,21 +963,7 @@ if enable_netconfig
endif
output += '\n'
output += ' config-dns-rc-manager-default: ' + config_dns_rc_manager_default + '\n'
output += '\nDHCP clients (default ' + config_dhcp_default + '):\n'
output += ' dhcpcanon: ' + enable_dhcpcanon.to_string()
if enable_dhcpcanon
output += ' ' + dhcpcanon.path()
endif
output += '\n'
output += ' dhclient: ' + enable_dhclient.to_string()
if enable_dhclient
output += ' ' + dhclient.path()
endif
output += '\n'
output += ' dhcpcd: ' + enable_dhcpcd.to_string()
if enable_dhcpcd
output += ' ' + dhcpcd.path()
endif
output += '\nDHCP clients (default ' + config_dhcp_default + '):\n' + dhcp_summary
output += '\n'
output += '\nMiscellaneous:\n'
output += ' have introspection: ' + enable_introspection.to_string() + '\n'
......
......@@ -54,9 +54,9 @@ option('netconfig', type: 'array', value: ['netconfig', '/sbin/netconfig', '/usr
option('config_dns_rc_manager_default', type: 'combo', choices: ['symlink', 'file', 'netconfig', 'resolvconf'], value: 'symlink', description: 'Configure default value for main.rc-manager setting')
# 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 support')
option('dhclient', type: 'string', value: '', description: 'Enable dhclient support')
option('dhcpcanon', type: 'string', value: '', description: 'Enable dhcpcanon support (experimental)')
option('dhcpcd', type: 'string', value: '', 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')
# miscellaneous
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment