fix merge error

diff --git a/configure b/configure
index 8df3461439b493ff86f007fad1ddfe69846721de..ddd596bc0548998b9618f05d22872596d0995400 100755 (executable)
--- a/configure
+++ b/configure
@@ -1728,11 +1728,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
@@ -18790,6 +18785,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.  */
 

diff --git a/configure.in b/configure.in
index b8177fae3ea2d856e5bb510cd55274cf5792771d..d2f76d79240251421df2566b751d4105a0711e90 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3383,7 +3383,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