[GNUnet-SVN] [libmicrohttpd] branch master updated: Fixed build on pthread examples when non-pthread lib used for MHD

[gnunet]

This is an automated email from the git hooks/post-receive script.

karlson2k pushed a commit to branch master
in repository libmicrohttpd.

The following commit(s) were added to refs/heads/master by this push:
     new c0168fde Fixed build on pthread examples when non-pthread lib used for 
MHD
c0168fde is described below

commit c0168fde5043523fb2c05c76ca4506cb734c43b8
Author: Evgeny Grin (Karlson2k) <address@hidden>
AuthorDate: Sun Aug 13 14:12:24 2017 +0300

    Fixed build on pthread examples when non-pthread lib used for MHD
---
 src/examples/Makefile.am | 16 ++++++++++++----
 1 file 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
 noinst_PROGRAMS += \
   post_example
 if HAVE_MAGIC
-noinst_PROGRAMS += \
-  demo \
-  demo_https
+if HAVE_POSIX_THREADS
+noinst_PROGRAMS += demo
+if ENABLE_HTTPS
+noinst_PROGRAMS += demo_https
+endif
+endif
 endif
 endif
 
@@ -55,10 +58,12 @@ noinst_PROGRAMS += \
  authorization_example
 endif
 
+if HAVE_POSIX_THREADS
 if ENABLE_UPGRADE
 noinst_PROGRAMS += \
  upgrade_example
 endif
+endif
 
 if HAVE_W32
 AM_CFLAGS += -DWINDOWS
@@ -71,8 +76,11 @@ minimal_example_LDADD = \
 
 upgrade_example_SOURCES = \
  upgrade_example.c
+upgrade_example_CFLAGS = \
+  $(PTHREAD_CFLAGS) $(AM_CFLAGS)
 upgrade_example_LDADD = \
- $(top_builddir)/src/microhttpd/libmicrohttpd.la
+  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
+  $(PTHREAD_LIBS)
 
 timeout_SOURCES = \
  timeout.c

-- 
To stop receiving notification emails like this one, please contact
address@hidden