Commit 8c1b8dd5 authored by Mark Andrews's avatar Mark Andrews
Browse files

fix merge error

parent 6bbbf129
......@@ -1711,11 +1711,6 @@ Optional Features:
[all|minimal(default)|none]
--enable-ipv6 use IPv6 [default=autodetect]
--disable-tcp-fastopen disable TCP Fast Open support [default=autodetect]
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TCP_FASTOPEN socket option" >&5
$as_echo_n "checking for TCP_FASTOPEN socket option... " >&6; }
case "$enable_tcp_fastopen" in
yes|''|autodetect
--enable-getifaddrs enable the use of getifaddrs() [yes|no].
--disable-isc-spnego use SPNEGO from GSSAPI library
--disable-chroot disable chroot
......@@ -18833,6 +18828,11 @@ if test "${enable_tcp_fastopen+set}" = set; then :
enableval=$enable_tcp_fastopen;
fi
 
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TCP_FASTOPEN socket option" >&5
$as_echo_n "checking for TCP_FASTOPEN socket option... " >&6; }
case "$enable_tcp_fastopen" in
yes|''|autodetect)
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
 
......
......@@ -3418,7 +3418,7 @@ AC_SUBST(ISC_PLATFORM_NEEDPORTT)
AC_ARG_ENABLE(tcp_fastopen,
AS_HELP_STRING([--disable-tcp-fastopen],
[disable TCP Fast Open support [default=autodetect]])
[disable TCP Fast Open support [default=autodetect]]))
AC_MSG_CHECKING(for TCP_FASTOPEN socket option)
case "$enable_tcp_fastopen" in
......
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