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

    Manual merge for rt40381.

diff --git a/RELNOTES b/RELNOTES
index c7ab255fc94063676b401f21c939ab6865bc29ea..16cd4583713511d94c92ad9d076e294d0f272ce7 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -60,6 +60,13 @@ by Eric Young (eay@cryptsoft.com).
 
                        Changes since 4.1-ESV-R12
 
+- 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]
+
 - Corrected compilation errors that prohibited building the server's 
   ATF unit tests when failover is disabled.
   [ISC-Bugs #40372]

diff --git a/configure.ac b/configure.ac
index ca68ccc57f428c590e547012284f046490616bfa..6f3fa08029c10e565f6607dea62d75c393145291 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -88,6 +88,7 @@ AC_ARG_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
@@ -98,6 +99,7 @@ AC_ARG_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,6 +121,8 @@ 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.
@@ -127,6 +131,7 @@ AC_ARG_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
@@ -663,6 +668,8 @@ Features:
   debug:         $enable_debug
   failover:      $enable_failover
   execute:       $enable_execute
+  dhcpv6:        $enable_dhcpv6
+  delayed-ack:   $enable_delayed_ack
 
 Developer:
   ATF unittests : $atf_path