[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [libmicrohttpd] branch master updated: check for dlfcn.h pr
From: |
gnunet |
Subject: |
[GNUnet-SVN] [libmicrohttpd] branch master updated: check for dlfcn.h presence |
Date: |
Sun, 04 Mar 2018 13:08:24 +0100 |
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 77398cdb check for dlfcn.h presence
77398cdb is described below
commit 77398cdb5522ecccf7a7a7163ad9f23b467889c1
Author: Christian Grothoff <address@hidden>
AuthorDate: Sun Mar 4 13:08:22 2018 +0100
check for dlfcn.h presence
---
configure.ac | 3 +++
src/lib/Makefile.am | 14 +++++++-------
src/lib/daemon_options.c | 5 +++--
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4628de86..5e3dc7a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -754,6 +754,9 @@ AC_CHECK_HEADER([[search.h]],
AM_CONDITIONAL([MHD_HAVE_TSEARCH], [[test "x$ac_cv_header_search_h" = xyes &&
test "x$HAVE_TSEARCH" = "x1" && test "x$REPLACE_TSEARCH" != "x1"]])
+AC_CHECK_HEADERS([dlfcn.h],[have_tlsplugin=yes],[have_tlsplugin=no],
[AC_INCLUDES_DEFAULT])
+AM_CONDITIONAL([MHD_HAVE_TLS_PLUGIN], [[test "x$have_tlsplugin" = xyes]])
+
# Check for generic functions
AC_CHECK_FUNCS([rand random])
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 68104adf..597afc00 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -108,7 +108,7 @@ libmicrohttpd2_la_SOURCES = \
sysfdsetsize.c sysfdsetsize.h \
upgrade_process.c upgrade_process.h \
panic.c \
- version.c
+ version.c
libmicrohttpd2_la_CPPFLAGS = \
$(AM_CPPFLAGS) $(MHD_LIB_CPPFLAGS) \
@@ -116,9 +116,14 @@ libmicrohttpd2_la_CPPFLAGS = \
libmicrohttpd2_la_CFLAGS = \
$(AM_CFLAGS) $(MHD_LIB_CFLAGS)
libmicrohttpd2_la_LDFLAGS = \
- $(MHD_LIB_LDFLAGS) -ldl \
+ $(MHD_LIB_LDFLAGS) \
$(W32_MHD_LIB_LDFLAGS) \
-version-info 0:0:0 # FIXME: fix once closer to release...
+if MHD_HAVE_TLS_PLUGIN
+libmicrohttpd2_la_LDFLAGS += \
+ -ldl
+endif
+
libmicrohttpd2_la_LIBADD = \
$(MHD_LIBDEPS) # FIXME: should separate out GNUTLS_LIBS/GCRYPT here!
@@ -175,8 +180,3 @@ if ENABLE_BAUTH
# basicauth.c \
# base64.c base64.h
endif
-
-
-
-
-
diff --git a/src/lib/daemon_options.c b/src/lib/daemon_options.c
index 94c8fa0b..7839cad2 100644
--- a/src/lib/daemon_options.c
+++ b/src/lib/daemon_options.c
@@ -23,8 +23,9 @@
* @author Christian Grothoff
*/
#include "internal.h"
+#if HAVE_DLFCN_H
#include <dlfcn.h>
-
+#endif
/**
* Set logging method. Specify NULL to disable logging entirely. By
@@ -351,7 +352,7 @@ MHD_daemon_set_tls_backend (struct MHD_Daemon *daemon,
const char *tls_backend,
const char *ciphers)
{
-#ifndef HTTPS_SUPPORT
+#if ! (defined(HTTPS_SUPPORT) && defined (HAVE_DLFCN_H))
return MHD_SC_TLS_DISABLED;
#else
char filename[1024];
--
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: check for dlfcn.h presence,
gnunet <=