diff --git a/configure.ac b/configure.ac
index 702af4c7..32aa1983 100644
--- a/configure.ac
+++ b/configure.ac
@@ -228,7 +228,7 @@ AC_ARG_WITH(libgcrypt,
 
 # define the minimal version of libgcrypt required   
 MHD_GCRYPT_VERSION=1:1.2.4
-AC_DEFINE_UNQUOTED([MHD_GCRYPT_VERSION], $MHD_GCRYPT_VERSION, [gcrypt lib version])
+AC_DEFINE_UNQUOTED([MHD_GCRYPT_VERSION], "$MHD_GCRYPT_VERSION", [gcrypt lib version])
   
 AC_SUBST(GCRYPT_LIB_PATH)
 AC_SUBST(GCRYPT_LDFLAGS)
diff --git a/src/daemon/internal.c b/src/daemon/internal.c
index a86c70d8..3a060063 100644
--- a/src/daemon/internal.c
+++ b/src/daemon/internal.c
@@ -42,14 +42,14 @@ MHD_DLOG (const struct MHD_Daemon *daemon, const char *format, ...)
   VFPRINTF (stderr, format, va);
   va_end (va);
 }
-
+#endif
 void
 MHD_tls_log_func (int level, const char *str)
 {
   fprintf (stdout, "|<%d>| %s", level, str);
 }
 
-#endif
+
 
 /**
  * Process escape sequences ('+'=space, %HH)
diff --git a/src/daemon/internal.h b/src/daemon/internal.h
index 99566073..af6d05fe 100644
--- a/src/daemon/internal.h
+++ b/src/daemon/internal.h
@@ -66,8 +66,9 @@
  * messages.
  */
 void MHD_DLOG (const struct MHD_Daemon *daemon, const char *format, ...);
-void MHD_tls_log_func (int level, const char *str);
+
 #endif
+void MHD_tls_log_func (int level, const char *str);
 
 /**
  * Process escape sequences ('+'=space, %HH).