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

[gnunet]

Author: grothoff
Date: 2014-02-04 14:51:06 +0100 (Tue, 04 Feb 2014)
New Revision: 32201

Modified:
   libmicrohttpd/configure.ac
   libmicrohttpd/src/testcurl/test_digestauth.c
   libmicrohttpd/src/testcurl/test_digestauth_with_arguments.c
   libmicrohttpd/src/testcurl/test_postform.c
Log:
Karlson2k: Fix win32 cURL tests

Modified: libmicrohttpd/configure.ac
===================================================================
--- libmicrohttpd/configure.ac  2014-02-04 13:32:13 UTC (rev 32200)
+++ libmicrohttpd/configure.ac  2014-02-04 13:51:06 UTC (rev 32201)
@@ -225,7 +225,7 @@
 AC_CHECK_HEADERS([fcntl.h math.h errno.h limits.h stdio.h locale.h sys/stat.h 
sys/types.h pthread.h],,AC_MSG_ERROR([Compiling libmicrohttpd requires standard 
UNIX headers files]))
 
 # Check for optional headers
-AC_CHECK_HEADERS([sys/types.h sys/time.h sys/msg.h netdb.h netinet/in.h 
netinet/tcp.h time.h sys/socket.h sys/mman.h arpa/inet.h sys/select.h poll.h 
winsock2.h ws2tcpip.h])
+AC_CHECK_HEADERS([sys/types.h sys/time.h sys/msg.h netdb.h netinet/in.h 
netinet/tcp.h time.h sys/socket.h sys/mman.h arpa/inet.h sys/select.h poll.h 
winsock2.h ws2tcpip.h gcrypt.h])
 
 AC_CHECK_HEADERS([search.h], AM_CONDITIONAL(HAVE_TSEARCH, true), 
AM_CONDITIONAL(HAVE_TSEARCH, false))
 

Modified: libmicrohttpd/src/testcurl/test_digestauth.c
===================================================================
--- libmicrohttpd/src/testcurl/test_digestauth.c        2014-02-04 13:32:13 UTC 
(rev 32200)
+++ libmicrohttpd/src/testcurl/test_digestauth.c        2014-02-04 13:51:06 UTC 
(rev 32201)
@@ -31,7 +31,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#ifdef HAVE_GCRYPT_H
 #include <gcrypt.h>
+#endif
 
 #ifndef WINDOWS
 #include <sys/socket.h>
@@ -229,10 +231,12 @@
 {
   unsigned int errorCount = 0;
 
+#ifdef HAVE_GCRYPT_H
   gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
 #ifdef GCRYCTL_INITIALIZATION_FINISHED
   gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
 #endif
+#endif
 if (0 != curl_global_init (CURL_GLOBAL_WIN32))
     return 2;
   errorCount += testDigestAuth ();

Modified: libmicrohttpd/src/testcurl/test_digestauth_with_arguments.c
===================================================================
--- libmicrohttpd/src/testcurl/test_digestauth_with_arguments.c 2014-02-04 
13:32:13 UTC (rev 32200)
+++ libmicrohttpd/src/testcurl/test_digestauth_with_arguments.c 2014-02-04 
13:51:06 UTC (rev 32201)
@@ -30,7 +30,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#ifdef HAVE_GCRYPT_H
 #include <gcrypt.h>
+#endif
 
 #ifndef WINDOWS
 #include <sys/socket.h>
@@ -227,10 +229,12 @@
 {
   unsigned int errorCount = 0;
 
+#ifdef HAVE_GCRYPT_H
   gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
 #ifdef GCRYCTL_INITIALIZATION_FINISHED
   gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
 #endif
+#endif
   if (0 != curl_global_init (CURL_GLOBAL_WIN32))
     return 2;
   errorCount += testDigestAuth ();

Modified: libmicrohttpd/src/testcurl/test_postform.c
===================================================================
--- libmicrohttpd/src/testcurl/test_postform.c  2014-02-04 13:32:13 UTC (rev 
32200)
+++ libmicrohttpd/src/testcurl/test_postform.c  2014-02-04 13:51:06 UTC (rev 
32201)
@@ -31,7 +31,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#ifdef HAVE_GCRYPT_H
 #include <gcrypt.h>
+#endif
 
 #ifndef WINDOWS
 #include <unistd.h>
@@ -468,10 +470,12 @@
 {
   unsigned int errorCount = 0;
 
+#ifdef HAVE_GCRYPT_H
   gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
 #ifdef GCRYCTL_INITIALIZATION_FINISHED
   gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
 #endif
+#endif
   oneone = NULL != strstr (argv[0], "11");
   if (0 != curl_global_init (CURL_GLOBAL_WIN32))
     return 2;