[libmicrohttpd] branch master updated (d880367c -> b5315c24)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from d880367c test_postprocessor_md: fixed wrong CPPFLAGS
     new 6d7b7d00 configure: minor fixes
     new b5315c24 Fixed builds with --disable-messages

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            |  4 ++--
 src/microhttpd/daemon.c | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 61b903d7..ac5afe0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -640,7 +640,7 @@ AM_CONDITIONAL([DISABLE_THREADS], [test "x$USE_THREADS" = 
"xnone"])
 AC_MSG_RESULT([$USE_THREADS])
 
 AC_ARG_ENABLE([[thread-names]],
-   [AS_HELP_STRING([--disable-thread-names [auto] ],[do not set names on MHD 
generated threads])],
+   [AS_HELP_STRING([--disable-thread-names],[do not set names on MHD generated 
threads [auto]])],
    [], [enable_thread_names='auto'])
 
 AS_IF([test "x$enable_thread_names" != "xno" && test "x$USE_THREADS" = 
"xposix"],[
@@ -1691,7 +1691,7 @@ ssize_t sendfile(int out_fd, int in_fd,
   ]
 )
 AS_IF([[test "x$found_sendfile" = "xno" && test "x$enable_sendfile" = "xyes"]],
-  AC_MSG_ERROR([[sendfile() usage was requested by configure parameter, but no 
usable sendfile() function is detected]])
+  [AC_MSG_ERROR([[sendfile() usage was requested by configure parameter, but 
no usable sendfile() function is detected]])]
 )
 
 # optional: have error messages ?
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 284e7e57..40ec8fc9 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -215,7 +215,7 @@ MHD_check_global_init_ (void)
 
 #endif /* ! _AUTOINIT_FUNCS_ARE_SUPPORTED */
 
-
+#ifdef HAVE_MESSAGES
 /**
  * Default logger function
  */
@@ -231,6 +231,9 @@ MHD_default_logger_ (void *cls,
 }
 
 
+#endif /* HAVE_MESSAGES */
+
+
 /**
  * Free the memory given by @a ptr. Calls "free(ptr)".  This function
  * should be used to free the username returned by
@@ -5651,14 +5654,14 @@ parse_options_va (struct MHD_Daemon *daemon,
                       gnutls_certificate_retrieve_function2 *);
       if (0 != (daemon->options & MHD_USE_TLS))
         daemon->cert_callback = pgcrf;
-      else
 #ifdef HAVE_MESSAGES
+      else
         MHD_DLOG (daemon,
                   _ (
                     "MHD HTTPS option %d passed to MHD but MHD_USE_TLS not 
set.\n"),
                   opt);
-#endif
-        break;
+#endif /*  HAVE_MESSAGES */
+      break;
 #endif
     case MHD_OPTION_HTTPS_CERT_CALLBACK2:
 #if GNUTLS_VERSION_NUMBER < 0x030603
@@ -5673,14 +5676,14 @@ parse_options_va (struct MHD_Daemon *daemon,
                        gnutls_certificate_retrieve_function3 *);
       if (0 != (daemon->options & MHD_USE_TLS))
         daemon->cert_callback2 = pgcrf2;
-      else
 #ifdef HAVE_MESSAGES
+      else
         MHD_DLOG (daemon,
                   _ (
                     "MHD HTTPS option %d passed to MHD but MHD_USE_TLS not 
set.\n"),
                   opt);
-#endif
-        break;
+#endif /* HAVE_MESSAGES */
+      break;
 #endif
 #endif /* HTTPS_SUPPORT */
 #ifdef DAUTH_SUPPORT
@@ -5737,8 +5740,8 @@ parse_options_va (struct MHD_Daemon *daemon,
 #ifdef HAVE_MESSAGES
       MHD_DLOG (daemon,
                 _ ("TCP fastopen is not supported on this platform.\n"));
-      return MHD_NO;
 #endif /* HAVE_MESSAGES */
+      return MHD_NO;
 #endif /* ! TCP_FASTOPEN */
     case MHD_OPTION_LISTENING_ADDRESS_REUSE:
       daemon->listening_address_reuse = va_arg (ap,

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.