Temporary disabling fastopen in travis

Sebastiano Merlino · Sebastiano Merlino · commit 05c9c0c1ab65 · 2015-12-27T21:53:13.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -20,7 +20,7 @@ script:
  - ./bootstrap
  - mkdir build
  - cd build
- - if [ $DEBUG = "debug" ]; then ../configure --enable-debug --disable-shared; else ../configure; fi
+ - if [ $DEBUG = "debug" ]; then ../configure --enable-debug --disable-shared --disable-fastopen; else ../configure --disable-fastopen; fi
  - make
  - make check
 after_success:
diff --git a/configure.ac b/configure.ac
@@ -113,10 +113,22 @@ AC_CHECK_HEADER([microhttpd.h],
 CXXFLAGS="-DHTTPSERVER_COMPILATION -D_REENTRANT $LIBMICROHTTPD_CFLAGS $CXXFLAGS"
 LDFLAGS="$LIBMICROHTTPD_LIBS $REGEX_LIBS $LD_FLAGS"
 
-if test x"$is_windows" = x"no"; then
-    if test `uname -r |cut -d. -f1` -ge 3; then
-        if test `uname -r |cut -d. -f2` -ge 7; then
-            CXXFLAGS="-DUSE_FASTOPEN $CXXFLAGS"
+AC_MSG_CHECKING([whether to build with TCP_FASTOPEN support])
+AC_ARG_ENABLE([fastopen],
+    [AS_HELP_STRING([--enable-fastopen],
+        [enable use of TCP_FASTOPEN (def=yes)])],
+    [fastopen="$enableval"],
+    [fastopen=yes])
+AC_MSG_RESULT([$fastopen])
+
+is_fastopen_supported=no;
+if test x"$fastopen" = x"yes"; then
+    if test x"$is_windows" = x"no"; then
+        if test `uname -r |cut -d. -f1` -ge 3; then
+            if test `uname -r |cut -d. -f2` -ge 7; then
+                CXXFLAGS="-DUSE_FASTOPEN $CXXFLAGS";
+                is_fastopen_supported=yes;
+            fi
         fi
     fi
 fi
@@ -217,4 +229,5 @@ AC_MSG_NOTICE([Configuration Summary:
   License         :  LGPL only
   Debug	          :  ${debugit}
   TLS Enabled     :  ${have_gnutls}
+  TCP_FASTOPEN    :  ${is_fastopen_supported}
 ])
