From ce738b09da4cbbc5da3e36b4849c477ad82f600f Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 8 Sep 2008 06:06:37 +0000
Subject: cleanup

---
 src/testcurl/Makefile.am          | 10 +++-------
 src/testcurl/curl_version_check.c |  4 ++--
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/testcurl/Makefile.am b/src/testcurl/Makefile.am
index ba9d2646..b6cab739 100644
--- a/src/testcurl/Makefile.am
+++ b/src/testcurl/Makefile.am
@@ -5,6 +5,7 @@ SUBDIRS += https
 endif
 
 AM_CPPFLAGS = \
+-I$(top_srcdir) \
 -I$(top_srcdir)/src/daemon \
 -I$(top_srcdir)/src/include \
 $(LIBCURL_CPPFLAGS)
@@ -27,24 +28,19 @@ check_PROGRAMS = \
   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 = \
diff --git a/src/testcurl/curl_version_check.c b/src/testcurl/curl_version_check.c
index b9b9bc08..f794aa25 100644
--- a/src/testcurl/curl_version_check.c
+++ b/src/testcurl/curl_version_check.c
@@ -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 @@ curl_check_version (const char *req_version)
 {
   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;
-- 
cgit v1.2.3