diff options
author | Christian Grothoff <christian@grothoff.org> | 2008-09-08 06:06:37 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2008-09-08 06:06:37 +0000 |
commit | ce738b09da4cbbc5da3e36b4849c477ad82f600f (patch) | |
tree | b3e84a7c04bb1d477374163df9552d64cae91ce4 | |
parent | 345f4a8f9908f46584036b5a5d6be7677844a9c3 (diff) | |
download | libmicrohttpd-ce738b09da4cbbc5da3e36b4849c477ad82f600f.tar.gz libmicrohttpd-ce738b09da4cbbc5da3e36b4849c477ad82f600f.zip |
cleanup
-rw-r--r-- | src/testcurl/Makefile.am | 10 | ||||
-rw-r--r-- | 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 | |||
5 | endif | 5 | endif |
6 | 6 | ||
7 | AM_CPPFLAGS = \ | 7 | AM_CPPFLAGS = \ |
8 | -I$(top_srcdir) \ | ||
8 | -I$(top_srcdir)/src/daemon \ | 9 | -I$(top_srcdir)/src/daemon \ |
9 | -I$(top_srcdir)/src/include \ | 10 | -I$(top_srcdir)/src/include \ |
10 | $(LIBCURL_CPPFLAGS) | 11 | $(LIBCURL_CPPFLAGS) |
@@ -27,24 +28,19 @@ check_PROGRAMS = \ | |||
27 | daemontest_put_chunked | 28 | daemontest_put_chunked |
28 | noinst_PROGRAMS = \ | 29 | noinst_PROGRAMS = \ |
29 | daemon_options_test | 30 | daemon_options_test |
30 | 31 | ||
31 | TESTS = $(check_PROGRAMS) | 32 | TESTS = $(check_PROGRAMS) |
32 | 33 | ||
33 | noinst_LIBRARIES = libcurl_version_check.a | 34 | noinst_LIBRARIES = libcurl_version_check.a |
34 | 35 | ||
35 | libcurl_version_check_a_SOURCES = \ | 36 | libcurl_version_check_a_SOURCES = \ |
36 | curl_version_check.c | 37 | curl_version_check.c |
37 | libcurl_version_check_a_CPPFLAGS = \ | ||
38 | -I$(top_srcdir)/src/daemon \ | ||
39 | -I$(top_srcdir)/src/include \ | ||
40 | -I$(top_srcdir)/src/daemon/https \ | ||
41 | $(LIBCURL_CPPFLAGS) | ||
42 | 38 | ||
43 | daemon_options_test_SOURCES = \ | 39 | daemon_options_test_SOURCES = \ |
44 | daemon_options_test.c | 40 | daemon_options_test.c |
45 | daemon_options_test_LDADD = \ | 41 | daemon_options_test_LDADD = \ |
46 | $(top_builddir)/src/daemon/libmicrohttpd.la | 42 | $(top_builddir)/src/daemon/libmicrohttpd.la |
47 | 43 | ||
48 | daemontest_get_SOURCES = \ | 44 | daemontest_get_SOURCES = \ |
49 | daemontest_get.c | 45 | daemontest_get.c |
50 | daemontest_get_LDADD = \ | 46 | 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 @@ | |||
27 | #include "MHD_config.h" | 27 | #include "MHD_config.h" |
28 | #include "platform.h" | 28 | #include "platform.h" |
29 | #include <curl/curl.h> | 29 | #include <curl/curl.h> |
30 | #include <microhttpd.h> | ||
31 | #include "internal.h" | ||
32 | 30 | ||
33 | #ifndef WINDOWS | 31 | #ifndef WINDOWS |
34 | #include <unistd.h> | 32 | #include <unistd.h> |
@@ -78,8 +76,10 @@ curl_check_version (const char *req_version) | |||
78 | { | 76 | { |
79 | const char *ver; | 77 | const char *ver; |
80 | const char *curl_ver; | 78 | const char *curl_ver; |
79 | #if HTTPS_SUPPORT | ||
81 | const char *ssl_ver; | 80 | const char *ssl_ver; |
82 | const char *req_ssl_ver; | 81 | const char *req_ssl_ver; |
82 | #endif | ||
83 | 83 | ||
84 | int loc_major, loc_minor, loc_micro; | 84 | int loc_major, loc_minor, loc_micro; |
85 | int rq_major, rq_minor, rq_micro; | 85 | int rq_major, rq_minor, rq_micro; |