[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [libmicrohttpd] branch master updated: fix linker error wit
From: |
gnunet |
Subject: |
[GNUnet-SVN] [libmicrohttpd] branch master updated: fix linker error with --with-gnutls path for mhd2 lib |
Date: |
Wed, 12 Sep 2018 15:38:17 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository libmicrohttpd.
The following commit(s) were added to refs/heads/master by this push:
new a145baea fix linker error with --with-gnutls path for mhd2 lib
a145baea is described below
commit a145baea795624a46cbdba90be691e8977118264
Author: Christian Grothoff <address@hidden>
AuthorDate: Wed Sep 12 15:38:14 2018 +0200
fix linker error with --with-gnutls path for mhd2 lib
---
src/lib/Makefile.am | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 57d9c595..a0f71779 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -111,13 +111,13 @@ libmicrohttpd2_la_SOURCES = \
version.c
libmicrohttpd2_la_CPPFLAGS = \
- $(AM_CPPFLAGS) $(MHD_LIB_CPPFLAGS) \
+ $(AM_CPPFLAGS) $(MHD_LIB_CPPFLAGS) $(MHD_TLS_LIB_CPPFLAGS) \
-DBUILDING_MHD_LIB=1
libmicrohttpd2_la_CFLAGS = \
- $(AM_CFLAGS) $(MHD_LIB_CFLAGS)
+ $(AM_CFLAGS) $(MHD_LIB_CFLAGS) $(MHD_TLS_LIB_CFLAGS)
libmicrohttpd2_la_LDFLAGS = \
$(MHD_LIB_LDFLAGS) \
- $(W32_MHD_LIB_LDFLAGS) \
+ $(W32_MHD_LIB_LDFLAGS) $(MHD_TLS_LIB_LDFLAGS) \
-version-info 0:0:0 # FIXME: fix once closer to release...
if MHD_HAVE_TLS_PLUGIN
libmicrohttpd2_la_LDFLAGS += \
@@ -125,7 +125,7 @@ libmicrohttpd2_la_LDFLAGS += \
endif
libmicrohttpd2_la_LIBADD = \
- $(MHD_LIBDEPS) # FIXME: should separate out GNUTLS_LIBS/GCRYPT here!
+ $(MHD_LIBDEPS) $(MHD_TLS_LIBDEPS)
if HAVE_W32
MHD_DLL_RES_SRC = ../microhttpd/microhttpd_dll_res.rc
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [libmicrohttpd] branch master updated: fix linker error with --with-gnutls path for mhd2 lib,
gnunet <=