aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Grin (Karlson2k) <k2k@narod.ru>2014-04-07 21:50:20 +0000
committerEvgeny Grin (Karlson2k) <k2k@narod.ru>2014-04-07 21:50:20 +0000
commit5cab359556eb6cbf0a38db6dd615e7789874194d (patch)
tree7d4491ab9d7a3d836075d22fc53689525a8e9b58
parent5fe37b899b0f62e7a6281f34b7921be007e289e2 (diff)
downloadlibmicrohttpd-5cab359556eb6cbf0a38db6dd615e7789874194d.tar.gz
libmicrohttpd-5cab359556eb6cbf0a38db6dd615e7789874194d.zip
Fixed MHD base tests with non-default path to GnuTLS includes, removed duplicated include
-rw-r--r--src/microhttpd/Makefile.am6
-rw-r--r--src/microhttpd/test_daemon.c1
2 files changed, 6 insertions, 1 deletions
diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am
index d3a303f2..c78febf0 100644
--- a/src/microhttpd/Makefile.am
+++ b/src/microhttpd/Makefile.am
@@ -151,17 +151,23 @@ test_daemon_LDADD = \
151 151
152test_postprocessor_SOURCES = \ 152test_postprocessor_SOURCES = \
153 test_postprocessor.c 153 test_postprocessor.c
154test_postprocessor_CPPFLAGS = \
155 $(AM_CPPFLAGS) $(GNUTLS_CPPFLAGS)
154test_postprocessor_LDADD = \ 156test_postprocessor_LDADD = \
155 $(top_builddir)/src/microhttpd/libmicrohttpd.la \ 157 $(top_builddir)/src/microhttpd/libmicrohttpd.la \
156 $(MHD_W32_LIB) 158 $(MHD_W32_LIB)
157 159
158test_postprocessor_amp_SOURCES = \ 160test_postprocessor_amp_SOURCES = \
159 test_postprocessor_amp.c 161 test_postprocessor_amp.c
162test_postprocessor_amp_CPPFLAGS = \
163 $(AM_CPPFLAGS) $(GNUTLS_CPPFLAGS)
160test_postprocessor_amp_LDADD = \ 164test_postprocessor_amp_LDADD = \
161 $(top_builddir)/src/microhttpd/libmicrohttpd.la 165 $(top_builddir)/src/microhttpd/libmicrohttpd.la
162 166
163test_postprocessor_large_SOURCES = \ 167test_postprocessor_large_SOURCES = \
164 test_postprocessor_large.c 168 test_postprocessor_large.c
169test_postprocessor_large_CPPFLAGS = \
170 $(AM_CPPFLAGS) $(GNUTLS_CPPFLAGS)
165test_postprocessor_large_LDADD = \ 171test_postprocessor_large_LDADD = \
166 $(top_builddir)/src/microhttpd/libmicrohttpd.la \ 172 $(top_builddir)/src/microhttpd/libmicrohttpd.la \
167 $(MHD_W32_LIB) 173 $(MHD_W32_LIB)
diff --git a/src/microhttpd/test_daemon.c b/src/microhttpd/test_daemon.c
index 8608a112..4382111f 100644
--- a/src/microhttpd/test_daemon.c
+++ b/src/microhttpd/test_daemon.c
@@ -25,7 +25,6 @@
25 */ 25 */
26 26
27#include "platform.h" 27#include "platform.h"
28#include "platform.h"
29#include "microhttpd.h" 28#include "microhttpd.h"
30#include <stdlib.h> 29#include <stdlib.h>
31#include <string.h> 30#include <string.h>