[GNUnet-SVN] r7970 - in libmicrohttpd: . src/testcurl/https

[gnunet]

Author: grothoff
Date: 2008-11-23 02:28:26 -0700 (Sun, 23 Nov 2008)
New Revision: 7970

Modified:
   libmicrohttpd/configure.ac
   libmicrohttpd/src/testcurl/https/tls_daemon_options_test.c
Log:
only use export syms if we do not do client

Modified: libmicrohttpd/configure.ac
===================================================================
--- libmicrohttpd/configure.ac  2008-11-23 09:25:31 UTC (rev 7969)
+++ libmicrohttpd/configure.ac  2008-11-23 09:28:26 UTC (rev 7970)
@@ -243,6 +243,8 @@
 
 AM_CONDITIONAL(ENABLE_HTTPS, test "$enable_https" = "yes")
 
+MHD_LIB_LDFLAGS="-export-dynamic -no-undefined"
+
 # optional: compile TLS client side code [only for test running] ?
 AC_MSG_CHECKING(whether to compile TLS client side code)
 AC_ARG_ENABLE(client-side,
@@ -255,6 +257,7 @@
 then
  AC_DEFINE([MHD_DEBUG_TLS],[0],[Compile client side code. This will enable 
running some test cases.])
  MSG_CLIENT_SIDE="disabled. running some test cases won't be possible"
+ MHD_LIB_LDFLAGS="$MHD_LIB_LDFLAGS -export-symbols \$(srcdir)/EXPORT.sym"
 else
  AC_DEFINE([MHD_DEBUG_TLS],[1],[Compile client side code. This will enable 
running some test cases.])
  MSG_CLIENT_SIDE="enabled" 
@@ -274,8 +277,6 @@
 AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"])
 
 
-MHD_LIB_LDFLAGS="-export-dynamic -no-undefined"
-MHD_LIB_LDFLAGS="$MHD_LIB_LDFLAGS -export-symbols \$(srcdir)/EXPORT.sym"
 AC_SUBST(MHD_LIB_LDFLAGS)
 
 

Modified: libmicrohttpd/src/testcurl/https/tls_daemon_options_test.c
===================================================================
--- libmicrohttpd/src/testcurl/https/tls_daemon_options_test.c  2008-11-23 
09:25:31 UTC (rev 7969)
+++ libmicrohttpd/src/testcurl/https/tls_daemon_options_test.c  2008-11-23 
09:28:26 UTC (rev 7970)
@@ -42,7 +42,6 @@
 
 #include "tls_test_keys.h"
 
-const int DEBUG_GNUTLS_LOG_LEVEL = 0;
 const char *test_file_name = "https_test_file";
 const char test_file_data[] = "Hello World\n";
 
@@ -437,8 +436,6 @@
   int daemon_flags =
     MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL | MHD_USE_DEBUG;
 
-  MHD_gtls_global_set_log_level (DEBUG_GNUTLS_LOG_LEVEL);
-
   if (curl_check_version (MHD_REQ_CURL_VERSION))
     {
       return -1;