summaryrefslogtreecommitdiff
path: root/meson.build
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2018-09-07 16:55:54 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2018-09-13 11:50:32 +0200
commit7be9db43031702fd469054e26affabc3c2c01c3a (patch)
tree7f95e208f1f11e270272e74133c7060e451c4de6 /meson.build
parent713b02f208fce184e11d1ab6975ab266445fb9b8 (diff)
build: move paths of dhcp clients from config-extra.h to config.h
Some path variable like $(bindir), $(datadir), etc. are special for autotools and must be handled separately through config-extra.h. But dhcp path variables are just normal variables defined through the configure script and should go into config.h.
Diffstat (limited to 'meson.build')
-rw-r--r--meson.build9
1 files changed, 0 insertions, 9 deletions
diff --git a/meson.build b/meson.build
index 14a655d3c..469739e85 100644
--- a/meson.build
+++ b/meson.build
@@ -885,15 +885,6 @@ config_extra_h = configuration_data()
config_extra_h.set_quoted('BINDIR', nm_bindir)
config_extra_h.set_quoted('DATADIR', nm_datadir)
-if enable_dhclient
- config_extra_h.set_quoted('DHCLIENT_PATH', dhclient.path())
-endif
-if enable_dhcpcanon
- config_extra_h.set_quoted('DHCPCANON_PATH', dhcpcanon.path())
-endif
-if enable_dhcpcd
- config_extra_h.set_quoted('DHCPCD_PATH', dhcpcd.path())
-endif
config_extra_h.set_quoted('LIBEXECDIR', nm_libexecdir)
config_extra_h.set_quoted('LOCALSTATEDIR', nm_localstatedir)
config_extra_h.set_quoted('NMCONFDIR', nm_pkgconfdir)