Commit e82906fc authored by Thomas Markwalder's avatar Thomas Markwalder
Browse files

[master] Added dhcpv6 and delayed_ack feature report to configure output

    Merged in rt40381.
parent db1a8f68
......@@ -54,6 +54,13 @@ by Eric Young (eay@cryptsoft.com).
Changes since 4.3.3
- Added dhcpv6 and delayed-ack to settings listed in the "Features:"
section of the configure script output. Additionally, all of the
features reported on will now always show either a "yes" or "no"
value. Prior to this features left to their default setting would
not show a value.
[ISC-Bugs #40381]
- Added the lease address to the end of the debug level log message
emitted when an existing lease is renewed within the dhcp-cache-threshold.
Thanks to Nathan Neulinger at Missouri S&T for suggesting the change.
......
......@@ -5300,6 +5300,7 @@ fi
# Failover is on by default, so define if it is not explicitly disabled.
if test "$enable_failover" != "no"; then
enable_failover="yes"
$as_echo "#define FAILOVER_PROTOCOL 1" >>confdefs.h
......@@ -5313,6 +5314,7 @@ fi
# execute() is on by default, so define if it is not explicitly disabled.
if test "$enable_execute" != "no" ; then
enable_execute="yes"
$as_echo "#define ENABLE_EXECUTE 1" >>confdefs.h
......@@ -5341,6 +5343,8 @@ if test "$enable_delayed_ack" = "yes"; then
$as_echo "#define DELAYED_ACK 1" >>confdefs.h
else
enable_delayed_ack="no"
fi
# DHCPv6 optional compile-time feature.
......@@ -5348,9 +5352,10 @@ fi
if test "${enable_dhcpv6+set}" = set; then :
enableval=$enable_dhcpv6;
fi
,
# DHCPv6 is on by default, so define if it is not explicitly disabled.
if test "$enable_dhcpv6" != "no"; then
enable_dhcpv6="yes"
$as_echo "#define DHCPv6 1" >>confdefs.h
......@@ -5448,6 +5453,8 @@ if test "$enable_binary_leases" = "yes"; then
$as_echo "#define BINARY_LEASES 1" >>confdefs.h
else
enable_binary_leases="no"
fi
# Testing section
......@@ -8486,6 +8493,8 @@ Features:
failover: $enable_failover
execute: $enable_execute
binary-leases: $enable_binary_leases
dhcpv6: $enable_dhcpv6
delayed-ack: $enable_delayed_ack
Developer:
ATF unittests : $atf_path
......
......@@ -91,6 +91,7 @@ AC_ARG_ENABLE(failover,
AS_HELP_STRING([--enable-failover],[enable support for failover (default is yes)]))
# Failover is on by default, so define if it is not explicitly disabled.
if test "$enable_failover" != "no"; then
enable_failover="yes"
AC_DEFINE([FAILOVER_PROTOCOL], [1],
[Define to include Failover Protocol support.])
fi
......@@ -100,6 +101,7 @@ AC_ARG_ENABLE(execute,
AS_HELP_STRING([--enable-execute],[enable support for execute() in config (default is yes)]))
# execute() is on by default, so define if it is not explicitly disabled.
if test "$enable_execute" != "no" ; then
enable_execute="yes"
AC_DEFINE([ENABLE_EXECUTE], [1],
[Define to include execute() config language support.])
fi
......@@ -119,13 +121,16 @@ AC_ARG_ENABLE(delayed_ack,
if test "$enable_delayed_ack" = "yes"; then
AC_DEFINE([DELAYED_ACK], [1],
[Define to queue multiple DHCPACK replies per fsync.])
else
enable_delayed_ack="no"
fi
# DHCPv6 optional compile-time feature.
AC_ARG_ENABLE(dhcpv6,
AS_HELP_STRING([--enable-dhcpv6],[enable support for DHCPv6 (default is yes)]))
AS_HELP_STRING([--enable-dhcpv6],[enable support for DHCPv6 (default is yes)])),
# DHCPv6 is on by default, so define if it is not explicitly disabled.
if test "$enable_dhcpv6" != "no"; then
enable_dhcpv6="yes"
AC_DEFINE([DHCPv6], [1],
[Define to 1 to include DHCPv6 support.])
fi
......@@ -194,6 +199,8 @@ AC_ARG_ENABLE(binary_leases,
if test "$enable_binary_leases" = "yes"; then
AC_DEFINE([BINARY_LEASES], [1],
[Define to support binary insertion of leases into queues.])
else
enable_binary_leases="no"
fi
# Testing section
......@@ -750,6 +757,8 @@ Features:
failover: $enable_failover
execute: $enable_execute
binary-leases: $enable_binary_leases
dhcpv6: $enable_dhcpv6
delayed-ack: $enable_delayed_ack
Developer:
ATF unittests : $atf_path
......
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