diff options
| author | Michael Biebl <biebl@debian.org> | 2024-09-01 22:38:35 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2024-09-01 22:38:35 +0200 |
| commit | f9bfd1158b8d08d6a5ed3bb7cc1ba7a6455e5201 (patch) | |
| tree | 10267dcf5b842b7c638a79bd6851549cd849b81d /configure.ac | |
| parent | 681dfc70ef98f6ed0c05bcb0fbff00e3fc0799ea (diff) | |
New upstream version 1.49.90 upstream/1.49.90
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index f486f312..1c3b1379 100644 --- a/configure.ac +++ b/configure.ac @@ -7,8 +7,8 @@ dnl - add corresponding NM_VERSION_x_y_z macros in dnl "shared/nm-version-macros.h.in" dnl - update number in meson.build m4_define([nm_major_version], [1]) -m4_define([nm_minor_version], [48]) -m4_define([nm_micro_version], [10]) +m4_define([nm_minor_version], [49]) +m4_define([nm_micro_version], [90]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version]) @@ -915,18 +915,18 @@ fi # DHCP client support AC_ARG_WITH([dhclient], - AS_HELP_STRING([--with-dhclient=yes|no|path], [Enable dhclient support])) -if test "$with_dhclient" != "no"; then - with_dhclient_="$with_dhclient" + AS_HELP_STRING([--with-dhclient=yes|no|path], [Enable dhclient support (deprecated)]), + with_dhclient="$withval", + with_dhclient="no") +if test "$with_dhclient" = yes; then AC_PATH_PROGS(with_dhclient, dhclient, no, /sbin:/usr/sbin:/usr/local/sbin) if test "$with_dhclient" = "no"; then - if test "$with_dhclient_" = yes; then - AC_MSG_WARN([dhclient not found, assume path /usr/sbin/dhclient]) - with_dhclient=/usr/sbin/dhclient - fi + AC_MSG_WARN([dhclient not found, assume path /usr/sbin/dhclient]) + with_dhclient=/usr/sbin/dhclient fi fi if test "$with_dhclient" != "no"; then + AC_MSG_WARN([dhclient is unmaintained and support for it is deprecated]) AC_DEFINE(WITH_DHCLIENT, 1, [Define if you have dhclient]) AC_DEFINE_UNQUOTED(DHCLIENT_PATH, "$with_dhclient", [Define path to dhclient]) else @@ -1477,7 +1477,7 @@ echo echo "DHCP clients (default $config_dhcp_default):" echo " dhcpcanon: $with_dhcpcanon" -echo " dhclient: $with_dhclient" +echo " dhclient: $with_dhclient (deprecated)" echo " dhcpcd: $with_dhcpcd" echo |