[GNUnet-SVN] [libmicrohttpd] branch master updated (4f40eb83 -> 8fce1b9b)

[gnunet]

This is an automated email from the git hooks/post-receive script.

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from 4f40eb83 .gitignore minor cleanup
     new 249dbe3d https_tests: fixed typo in libcurl version number
     new b670a492 configure: unified sendfile() function naming
     new 8fce1b9b configure: make sure that TLS flags are not passed to 
makefiles if TLS is not used

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 configure.ac                         | 20 +++++++++++++++++---
 src/testcurl/https/tls_test_common.c |  2 +-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 625b74ab..873af025 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1263,7 +1263,7 @@ ssize_t sendfile(int, int, off_t*, size_t);
   ],
   [
     AC_DEFINE([HAVE_LINUX_SENDFILE], [1], [Define to 1 if you have linux-style 
sendfile(2).])
-    found_sendfile="yes, linux-style"
+    found_sendfile="yes, Linux-style"
     AC_MSG_RESULT([[yes]])
     AC_CHECK_FUNCS([sendfile64]) 
   ],
@@ -1711,6 +1711,12 @@ choke me now
         AS_IF([[test "x$enable_https" = "xyes" ]], [AC_MSG_ERROR([[HTTPS 
support cannot be enabled without $crypt_missing.]])])
         enable_https=no
         MSG_HTTPS="no (lacking $crypt_missing)"
+        AS_UNSET([LIBGCRYPT_CFLAGS])
+        AS_UNSET([LIBGCRYPT_LIBS])
+        AS_UNSET([GNUTLS_CPPFLAGS])
+        AS_UNSET([GNUTLS_CFLAGS])
+        AS_UNSET([GNUTLS_LDFLAGS])
+        AS_UNSET([GNUTLS_LIBS])
        ],
          [
           AC_DEFINE([[HTTPS_SUPPORT]],[[1]],[Define to 1 if libmicrohttpd is 
compiled with HTTPS support.])
@@ -1724,13 +1730,15 @@ choke me now
              MHD_LIBDEPS="$GNUTLS_LIBS $LIBGCRYPT_LIBS $MHD_LIBDEPS"
              AC_DEFINE([[MHD_HTTPS_REQUIRE_GRYPT]], [[1]], [Define to `1' if 
HTTPS require initialisation of libgcrypt])
             ],
-            [[
+            [
              MSG_HTTPS="yes (using libgnutls)"
+             AS_UNSET([LIBGCRYPT_CFLAGS])
+             AS_UNSET([LIBGCRYPT_LIBS])
              MHD_LIB_CPPFLAGS="$MHD_LIB_CPPFLAGS $GNUTLS_CPPFLAGS"
              MHD_LIB_CFLAGS="$MHD_LIB_CFLAGS $GNUTLS_CFLAGS"
              MHD_LIB_LDFLAGS="$MHD_LIB_LDFLAGS $GNUTLS_LDFLAGS"
              MHD_LIBDEPS="$GNUTLS_LIBS $MHD_LIBDEPS"
-            ]]
+            ]
           )
           AS_IF([[ test "x$have_gnutls_pkgcfg" = "xyes" ]],
             [ # remove GnuTLS from private libs in .pc file as it defined in 
Requires.private
@@ -1754,6 +1762,12 @@ choke me now
      AS_IF([[test "x$enable_https" = "xyes" ]], [AC_MSG_ERROR([[HTTPS support 
cannot be enabled without $crypt_missing.]])])
      enable_https=no
      MSG_HTTPS="no (lacking $crypt_missing)"
+     AS_UNSET([LIBGCRYPT_CFLAGS])
+     AS_UNSET([LIBGCRYPT_LIBS])
+     AS_UNSET([GNUTLS_CPPFLAGS])
+     AS_UNSET([GNUTLS_CFLAGS])
+     AS_UNSET([GNUTLS_LDFLAGS])
+     AS_UNSET([GNUTLS_LIBS])
     ]
   )
 else
diff --git a/src/testcurl/https/tls_test_common.c 
b/src/testcurl/https/tls_test_common.c
index 24782615..a3a7df24 100644
--- a/src/testcurl/https/tls_test_common.c
+++ b/src/testcurl/https/tls_test_common.c
@@ -529,7 +529,7 @@ test_wrap (const char *test_name, int
 int testsuite_curl_global_init (void)
 {
   CURLcode res;
-#if LIBCURL_VERSION_NUM >= 0x07380
+#if LIBCURL_VERSION_NUM >= 0x073800
   if (CURLSSLSET_OK != curl_global_sslset(CURLSSLBACKEND_GNUTLS, NULL, NULL))
     {
       if (CURLSSLSET_TOO_LATE == curl_global_sslset(CURLSSLBACKEND_OPENSSL, 
NULL, NULL))

-- 
To stop receiving notification emails like this one, please contact
address@hidden