[GNUnet-SVN] r7664 - libmicrohttpd/src/testcurl

[gnunet]

Author: grothoff
Date: 2008-09-08 00:06:37 -0600 (Mon, 08 Sep 2008)
New Revision: 7664

Modified:
   libmicrohttpd/src/testcurl/Makefile.am
   libmicrohttpd/src/testcurl/curl_version_check.c
Log:
cleanup

Modified: libmicrohttpd/src/testcurl/Makefile.am
===================================================================
--- libmicrohttpd/src/testcurl/Makefile.am      2008-09-07 07:48:46 UTC (rev 
7663)
+++ libmicrohttpd/src/testcurl/Makefile.am      2008-09-08 06:06:37 UTC (rev 
7664)
@@ -5,6 +5,7 @@
 endif
 
 AM_CPPFLAGS = \
+-I$(top_srcdir) \
 -I$(top_srcdir)/src/daemon \
 -I$(top_srcdir)/src/include \
 $(LIBCURL_CPPFLAGS)
@@ -27,24 +28,19 @@
   daemontest_put_chunked
 noinst_PROGRAMS = \
   daemon_options_test
-  
+
 TESTS = $(check_PROGRAMS)
 
 noinst_LIBRARIES = libcurl_version_check.a
 
 libcurl_version_check_a_SOURCES = \
   curl_version_check.c
-libcurl_version_check_a_CPPFLAGS = \
-  -I$(top_srcdir)/src/daemon \
-  -I$(top_srcdir)/src/include \
-  -I$(top_srcdir)/src/daemon/https \
-  $(LIBCURL_CPPFLAGS)
 
 daemon_options_test_SOURCES = \
   daemon_options_test.c
 daemon_options_test_LDADD = \
   $(top_builddir)/src/daemon/libmicrohttpd.la
-  
+
 daemontest_get_SOURCES = \
   daemontest_get.c
 daemontest_get_LDADD = \

Modified: libmicrohttpd/src/testcurl/curl_version_check.c
===================================================================
--- libmicrohttpd/src/testcurl/curl_version_check.c     2008-09-07 07:48:46 UTC 
(rev 7663)
+++ libmicrohttpd/src/testcurl/curl_version_check.c     2008-09-08 06:06:37 UTC 
(rev 7664)
@@ -27,8 +27,6 @@
 #include "MHD_config.h"
 #include "platform.h"
 #include <curl/curl.h>
-#include <microhttpd.h>
-#include "internal.h"
 
 #ifndef WINDOWS
 #include <unistd.h>
@@ -78,8 +76,10 @@
 {
   const char *ver;
   const char *curl_ver;
+#if HTTPS_SUPPORT
   const char *ssl_ver;
   const char *req_ssl_ver;
+#endif
 
   int loc_major, loc_minor, loc_micro;
   int rq_major, rq_minor, rq_micro;