build: remove check on dhclient version

System Internals / NetworkManager - Beniamino Galvani [redhat.com] - 13 September 2018 09:49 EDT

dhclient 4.0 was released more than 10 years ago. I think it is reasonable to expect that nobody is using an older version today.

https://source.isc.org/cgi-bin/gitweb.cgi?p=dhcp.git;a=shortlog;h=refs/tags/v4_0_0

###

diff --git a/configure.ac b/configure.ac
index d53335ac2..23004cd1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -842,7 +842,7 @@ AM_CONDITIONAL(WITH_OPENVSWITCH, test "${enable_ovs}" = "yes")

# DHCP client support
AC_ARG_WITH([dhclient],
- AS_HELP_STRING([--with-dhclient=yes|no|path], [Enable dhclient 4.x support]))
+ AS_HELP_STRING([--with-dhclient=yes|no|path], [Enable dhclient support]))
if test "$with_dhclient" != "no"; then
with_dhclient_="$with_dhclient"
AC_PATH_PROGS(with_dhclient, dhclient, no, /sbin:/usr/sbin:/usr/local/sbin)
@@ -851,10 +851,6 @@ if test "$with_dhclient" != "no"; then
AC_MSG_WARN([dhclient not found, assume path /usr/sbin/dhclient])
with_dhclient=/usr/sbin/dhclient
fi
- else
- if ! $with_dhclient --version 2>&1 | grep -q "^isc-dhclient-4\."; then
- AC_MSG_WARN([Seems version of dhclient $with_dhclient is too old, version 4.x or newer is required.])
- fi
fi
fi
if test "$with_dhclient" != "no"; then
diff --git a/meson.build b/meson.build
index cfc82cad8..f23f4c388 100644
--- a/meson.build
+++ b/meson.build
@@ -560,11 +560,6 @@ if enable_dhclient
enable_dhclient = dhclient.found()

if enable_dhclient
- res = run_command(dhclient, '--version')
- # FIXME: dhcp outputs the version string through stderr!?
- if not res.stderr().strip().contains('isc-dhclient-4.')
- message('Seems version of dhclient ' + dhclient.path() + ' is too old, version 4.x or newer is required')
- endif
config_h.set_quoted('DHCLIENT_PATH', dhclient.path())
endif
endif
diff --git a/meson_options.txt b/meson_options.txt
index 82971e552..73e0602c4 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -55,7 +55,7 @@ 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 4.x support')
+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('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')

9e61ea704 build: remove check on dhclient version
configure.ac | 6 +-----
meson.build | 5 -----
meson_options.txt | 2 +-
3 files changed, 2 insertions(+), 11 deletions(-)

Upstream: cgit.freedesktop.org


  • Share