[GNUnet-SVN] [libmicrohttpd] branch master updated (9459be1e -> 14d85da7)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from 9459be1e configure: minor fixing GnuTLS detection in special cases
     new 0e477b33 configure: properly and deeply check for GnuTLS SNI, avoid 
double testing
     new 14d85da7 configure: always use "#include" at new line to ensure best 
compatibility with compilers

The 2 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 | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index fee368be..7aa620db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -372,7 +372,9 @@ AS_IF([[test "x$with_threads" = "xauto"]],
    [
     AC_MSG_CHECKING([[for W32 threads]])
     AC_LINK_IFELSE(
-      [AC_LANG_PROGRAM([#include <windows.h>], [ HANDLE h = CreateThread(NULL, 
0, NULL, NULL, 0, NULL);])]
+      [AC_LANG_PROGRAM([[
+#include <windows.h>
+         ]], [ HANDLE h = CreateThread(NULL, 0, NULL, NULL, 0, NULL);])]
       , [[mhd_have_w32_threads='yes']], [[mhd_have_w32_threads='no']]
       )
     AC_MSG_RESULT([[$mhd_have_w32_threads]])
@@ -676,7 +678,9 @@ if test "$enable_poll" != "no"; then
   else
     AC_MSG_CHECKING([for WSAPoll()])
     AC_LINK_IFELSE([
-      AC_LANG_PROGRAM([[#include <winsock2.h>]], [[
+      AC_LANG_PROGRAM([[
+#include <winsock2.h>
+       ]], [[
 WSAPOLLFD fda[2];
 WSAPoll(fda, 2, 0);]])],
         [
@@ -713,7 +717,9 @@ fi
 if test "x$enable_epoll" = "xyes"; then
   AC_CACHE_CHECK([for epoll_create1()], [mhd_cv_have_epoll_create1], [
     AC_LINK_IFELSE([
-      AC_LANG_PROGRAM([[#include <sys/epoll.h>]], [[
+      AC_LANG_PROGRAM([[
+#include <sys/epoll.h>
+        ]], [[
 int fd;
 fd = epoll_create1(EPOLL_CLOEXEC);]])],
       [mhd_cv_have_epoll_create1=yes],
@@ -1080,7 +1086,9 @@ AC_CHECK_DECL([[clock_gettime]],
         ])
      ], [], [$MHD_LIBDEPS])
    LIBS="$SAVE_LIBS"
-  ], [], [[#include <time.h>]])
+  ], [], [[
+#include <time.h>
+  ]])
 
 AC_MSG_CHECKING([[for clock_get_time]])
 AC_LINK_IFELSE(
@@ -1544,7 +1552,9 @@ choke me now
        LIBS="$LIBS $GNUTLS_LIBS"
        AC_MSG_CHECKING([[whether GnuTLS is usable]])
        AC_LINK_IFELSE([
-         AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], [[
+         AC_LANG_PROGRAM([[
+#include <gnutls/gnutls.h>
+          ]], [[
                 gnutls_session_t session;
                 gnutls_priority_t priorities;
                 gnutls_global_init();
@@ -1617,7 +1627,6 @@ AS_IF([test "x$with_gnutls" != "xno" && test 
"x$have_gnutls" != "xyes"],
             GNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS"
             GNUTLS_LDFLAGS="$LIBGCRYPT_LIBS"
             GNUTLS_LIBS="-lgnutls"
-            AC_CHECK_LIB([gnutls], [gnutls_load_file], [AC_CHECK_LIB([gnutls], 
[gnutls_privkey_import_x509_raw], [have_gnutls_sni=yes])])
             have_gnutls=yes
           ])], [], [AC_INCLUDES_DEFAULT])
        CPPFLAGS="$SAVE_CPPFLAGS"
@@ -1645,9 +1654,18 @@ AS_IF([test "x$have_gnutls" != "xyes" && test 
"x$with_gnutls" = "xyes"], [AC_MSG
      LIBS="$LIBS $GNUTLS_LIBS"
      AC_MSG_CHECKING([[for gnutls_privkey_import_x509_raw()]])
      AC_LINK_IFELSE([
-       AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], [[
+       AC_LANG_PROGRAM([[
+#include <gnutls/gnutls.h>
+#include <gnutls/abstract.h>
+          ]], [[
             gnutls_datum_t data;
-            gnutls_privkey_t key;
+            gnutls_privkey_t key = 0;
+#ifndef gnutls_load_file
+            (void)gnutls_load_file; /* Check for declaration. */
+#endif
+#ifndef gnutls_privkey_import_x509_raw
+            (void)gnutls_privkey_import_x509_raw; /* Check for declaration. */
+#endif
             gnutls_load_file("key.pem", &data);
             gnutls_privkey_import_x509_raw(key, &data, GNUTLS_X509_FMT_PEM, 
NULL, 0);
             gnutls_free(data.data);

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