]> git.ipfire.org Git - thirdparty/dhcp.git/commitdiff
[v4_1_esv] Updated auto-generated files following configure.ac updates
authorThomas Markwalder <tmark@isc.org>
Tue, 6 Oct 2015 19:59:47 +0000 (19:59 +0000)
committerThomas Markwalder <tmark@isc.org>
Tue, 6 Oct 2015 19:59:47 +0000 (19:59 +0000)
     Manual merge for rt40381 which modified configure.ac

configure

index f7bc03ac88ceee309aee9719e4e65fb84f2e4697..0b23b59f6b22058112573264b83e55e620663294 100755 (executable)
--- a/configure
+++ b/configure
@@ -5274,6 +5274,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
 
@@ -5287,6 +5288,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
 
@@ -5315,6 +5317,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.
@@ -5325,6 +5329,7 @@ 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
 
@@ -8084,6 +8089,8 @@ Features:
   debug:         $enable_debug
   failover:      $enable_failover
   execute:       $enable_execute
+  dhcpv6:        $enable_dhcpv6
+  delayed-ack:   $enable_delayed_ack
 
 Developer:
   ATF unittests : $atf_path