Update .travis.yml for newer libcurl. (#33)

Author: maru

.travis.yml

@@ -1,6 +1,10 @@
 language: c
 compiler: gcc
 sudo: false
+env:
+  NGHTTP2_VERSION=1.24.0
+  CURL_VERSION=7.49.0
+  CURL_DIR=curl-${CURL_VERSION}
 addons:
   apt:
     packages:
@@ -16,21 +20,48 @@ addons:
       - zzuf
       - socat
 install:
-  - if [ $TRAVIS_OS_NAME = linux ]; then
-      curl -L https://github.com/nghttp2/nghttp2/releases/download/v1.24.0/nghttp2-1.24.0.tar.gz |
-         tar xzf - &&
-         (cd nghttp2-1.24.0 && CXX="g++-4.8" ./configure --prefix=/usr --enable-lib-only && make && sudo make install);
-    fi
+  - |
+    cd ~/build/ &&
+    curl -L https://github.com/nghttp2/nghttp2/releases/download/v${NGHTTP2_VERSION}/nghttp2-${NGHTTP2_VERSION}.tar.gz |
+    tar xzf - &&
+    cd nghttp2-${NGHTTP2_VERSION} &&
+    CXX="g++-4.8" ./configure --prefix=/usr --enable-lib-only &&
+    make && sudo make install
+  - |
+    cd ~/build/ &&
+    curl -L https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.gz |
+    tar xzf - &&
+    cd ${CURL_DIR} &&
+    CXX="g++-4.8" ./configure --prefix=/usr --with-nghttp2 --without-ssl --with-gnutls &&
+    make && sudo make install
+  - cd ~/build/maru/libmicrohttpd-http2/
 before_script:
   - autoreconf -fi
 script:
-  - ./configure --enable-https --enable-http2 --with-nghttp2
-  - echo '#undef HAVE_INET6' >> MHD_config.h
-  - make
-  - make check
-  - sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
-  - ./configure --enable-https
-  - make
-  - make check
+  - export LD_LIBRARY_PATH=/usr/lib
+  - |
+    echo '
+    #include <curl/curl.h>
+    #include <stdio.h>
+
+    int
+    main (int argc, char *const *argv)
+    {
+      curl_version_info_data *curlverd = curl_version_info (CURLVERSION_NOW);
+      printf("curlverd->version %s\n", curlverd->version);
+      return 0;
+    }
+    ' | gcc -I/usr/include -L/usr/lib -xc - -lcurl && ./a.out && rm a.out
+  - |
+    ./configure --prefix=/usr --enable-https --disable-doc --enable-silent-rules --enable-asserts &&
+    echo '#undef HAVE_INET6' >> MHD_config.h &&
+    make && make check
+  - |
+    ./configure --prefix=/usr --enable-https --enable-http2 --with-nghttp2 --disable-doc --disable-silent-rules --enable-asserts &&
+    echo '#undef HAVE_INET6' >> MHD_config.h &&
+    make && make check
 after_failure:
   - cat src/microhttpd/test-suite.log
+  - cat ./src/testcurl/test-suite.log
+  - cat ./src/testcurl/https/test-suite.log
+  - cat ./src/testzzuf/test-suite.log

configure.ac

@@ -1193,7 +1193,7 @@ AC_ARG_ENABLE([curl],
 curl=0
 if test "$enable_curl" != "no"
 then
-  LIBCURL_CHECK_CONFIG([yes],[7.16.4],[enable_curl=yes],
+  LIBCURL_CHECK_CONFIG([yes],[7.49.0],[enable_curl=yes],
     [
       if test "x$enable_curl" = "xyes"; then
         AC_MSG_WARN([[cURL-based tests cannot be enabled because libcurl is missing]])
@@ -1204,7 +1204,7 @@ fi
 if test "$enable_curl" != "no"
 then
 # Lib cURL & cURL - OpenSSL versions
-  AC_DEFINE([MHD_REQ_CURL_VERSION], ["7.16.4"], [required cURL version to run tests])
+  AC_DEFINE([MHD_REQ_CURL_VERSION], ["7.49.0"], [required cURL version to run tests])
   AC_DEFINE([MHD_REQ_CURL_OPENSSL_VERSION], ["0.9.8"], [required cURL SSL version to run tests])
   AC_DEFINE([MHD_REQ_CURL_GNUTLS_VERSION], ["2.8.6"], [gnuTLS lib version - used in conjunction with cURL])
   AC_DEFINE([MHD_REQ_CURL_NSS_VERSION], ["3.12.0"], [NSS lib version - used in conjunction with cURL])
@@ -1909,8 +1909,8 @@ then
          CFLAGS="$NGHTTP2_CFLAGS $CFLAGS"
          LDFLAGS="$NGHTTP2_LIBS $LDFLAGS"
          LIBS="$LIBS $NGHTTP2_LIBS"
-         AC_MSG_CHECKING([[whether nghttp2 is usable]])
          NGHTTP2_CHECK()
+         AC_MSG_CHECKING([[whether nghttp2 is usable]])
          AS_IF([test "x$have_nghttp2" = "xyes"],
            [
             AC_MSG_RESULT([[yes]])