aboutsummaryrefslogtreecommitdiff
path: root/src/examples
diff options
context:
space:
mode:
authorEvgeny Grin (Karlson2k) <k2k@narod.ru>2017-08-13 14:12:24 +0300
committerEvgeny Grin (Karlson2k) <k2k@narod.ru>2017-08-13 14:16:07 +0300
commitc0168fde5043523fb2c05c76ca4506cb734c43b8 (patch)
tree259b3d486e9cbd75888cbdba8167987207ce8b7e /src/examples
parent4233bad6a1a6832cbeb007f726a0dbbfc11b8b7b (diff)
downloadlibmicrohttpd-c0168fde5043523fb2c05c76ca4506cb734c43b8.tar.gz
libmicrohttpd-c0168fde5043523fb2c05c76ca4506cb734c43b8.zip
Fixed build on pthread examples when non-pthread lib used for MHD
Diffstat (limited to 'src/examples')
-rw-r--r--src/examples/Makefile.am16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index 1c416e7b..aae7ff48 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -39,9 +39,12 @@ if HAVE_POSTPROCESSOR
39noinst_PROGRAMS += \ 39noinst_PROGRAMS += \
40 post_example 40 post_example
41if HAVE_MAGIC 41if HAVE_MAGIC
42noinst_PROGRAMS += \ 42if HAVE_POSIX_THREADS
43 demo \ 43noinst_PROGRAMS += demo
44 demo_https 44if ENABLE_HTTPS
45noinst_PROGRAMS += demo_https
46endif
47endif
45endif 48endif
46endif 49endif
47 50
@@ -55,10 +58,12 @@ noinst_PROGRAMS += \
55 authorization_example 58 authorization_example
56endif 59endif
57 60
61if HAVE_POSIX_THREADS
58if ENABLE_UPGRADE 62if ENABLE_UPGRADE
59noinst_PROGRAMS += \ 63noinst_PROGRAMS += \
60 upgrade_example 64 upgrade_example
61endif 65endif
66endif
62 67
63if HAVE_W32 68if HAVE_W32
64AM_CFLAGS += -DWINDOWS 69AM_CFLAGS += -DWINDOWS
@@ -71,8 +76,11 @@ minimal_example_LDADD = \
71 76
72upgrade_example_SOURCES = \ 77upgrade_example_SOURCES = \
73 upgrade_example.c 78 upgrade_example.c
79upgrade_example_CFLAGS = \
80 $(PTHREAD_CFLAGS) $(AM_CFLAGS)
74upgrade_example_LDADD = \ 81upgrade_example_LDADD = \
75 $(top_builddir)/src/microhttpd/libmicrohttpd.la 82 $(top_builddir)/src/microhttpd/libmicrohttpd.la \
83 $(PTHREAD_LIBS)
76 84
77timeout_SOURCES = \ 85timeout_SOURCES = \
78 timeout.c 86 timeout.c