From 3362a671f77099f9f53cb998a45eec073576391a Mon Sep 17 00:00:00 2001 From: Martin Schanzenbach Date: Sun, 17 May 2020 19:56:12 +0200 Subject: make mhd and jansson mandatory dependencies --- README | 7 +++---- configure.ac | 35 +++++++---------------------------- 2 files changed, 10 insertions(+), 32 deletions(-) diff --git a/README b/README index 87d4d635e..34f573d4d 100644 --- a/README +++ b/README @@ -63,7 +63,7 @@ These are the direct dependencies for running GNUnet: - gettext - gnutls >= 3.2.12 (highly recommended a gnutls linked against libunbound) -- A curl build against gnutls, or gnurl: +- curl (ideally built against gnutls) or gnurl: * libgnurl >= 7.35.0 (recommended, available from https://gnunet.org/en/gnurl.html) or @@ -74,8 +74,8 @@ These are the direct dependencies for running GNUnet: * libidn2 (prefered) or * libidn >= 1.0 -- libmicrohttpd >= 0.9.63 (strongly recommended for - a wide range of features) +- libmicrohttpd >= 0.9.63 +- libjansson - makeinfo >= 4.8 - make[*3] - nss (certutil binary, for @@ -124,7 +124,6 @@ These are the optional dependencies: - bluez (for bluetooth support) - grof (for linting of man pages) - libextractor >= 0.6.1 (highly recommended[*5]) -- libjansson - libopus >= 1.0.1 (for conversation tool) - libpulse >= 2.0 (for conversation tool) - libogg >= 1.3.0 (for conversation tool) diff --git a/configure.ac b/configure.ac index bae6c3e8d..1c732a152 100644 --- a/configure.ac +++ b/configure.ac @@ -786,12 +786,9 @@ AC_ARG_WITH(jansson, ], [AC_MSG_RESULT([--with-jansson not specified]) CHECK_LIBHEADER(JANSSON, jansson, json_loads, jansson.h,jansson=1,)]) -AM_CONDITIONAL(HAVE_JANSSON, [test "$jansson" = 1]) -AM_CONDITIONAL(HAVE_JSON, [test x$jansson = x1]) -AS_IF([test "x$jansson" = x1], - [AC_DEFINE([HAVE_JANSSON],[1],[Have jansson library])], - [AC_DEFINE([HAVE_JANSSON],[0],[Lacking jansson library])]) +AS_IF([test "x$jansson" != x1], + [AC_MSG_ERROR([GNUnet requires libjansson])]) # check for libpulse(audio) library pulse=0 @@ -1472,6 +1469,9 @@ AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd]) AM_CONDITIONAL(HAVE_JSON, [test x$jansson = x1]) AM_CONDITIONAL(HAVE_REST, [test x$jansson = x1 -a x$lmhd = x1]) +AS_IF([test "x$lmhd" != "x1"], + [AC_MSG_ERROR([GNUnet requires libmicrohttpd >= 0.9.63.])]) + # restore LIBS LIBS=$SAVE_LIBS @@ -2001,7 +2001,7 @@ AS_IF([test "x$enable_java_ports" = "xyes"], #### This could be moved to the checks above, #### but for now let's keep it here. #### -transport_msg="tcp udp unix" +transport_msg="tcp udp unix http" AS_IF([test "x$build_target" = "xlinux" -a "x$enable_experimental" = "xyes"], [transport_msg="$transport_msg wlan"]) # -- print message regarding enabled experimental features @@ -2047,26 +2047,10 @@ AS_IF([test "x$conversation_backend" = "xnone"], [AS_IF([test "x$opus" = x1], [conversation_msg="yes (x$conversation_backend)"], [AC_MSG_WARN([libopus not found (required to build conversation)])])]) -# -- rest / oidc -rest_msg="no" -AS_IF([test "x$lmhd" = "x1" -a "x$jansson" = "x1"], - [rest_msg="yes" - reclaim_msg="yes (with OpenID Connect)"], - [rest_msg="no" - reclaim_msg="yes (without OpenID Connect)"]) - # -- interface interface_msg=`echo $DEFAULT_INTERFACE | tr -d \"` -# -- libmicrohttpd -AS_IF([test "x$lmhd" = "x0"], - [libmicrohttpd_msg="no (REST service and HTTP transport will not be built)"], - [libmicrohttpd_msg="yes" - transport_msg="$transport_msg http_server"]) # -- jansson -AS_IF([test "x$jansson" = "x0"], - [jansson_msg="no (REST service will not be built)"], - [jansson_msg="yes"]) # -- libextractor AS_IF([test "$extractor" != 1], [AC_MSG_WARN([libextractor not found, but various file-sharing functions require it])], @@ -2084,8 +2068,7 @@ AS_IF([test "$gnurl" = "0"], [AC_MSG_NOTICE([Using libcurl as HTTP client library.]) http_client="curl"])], [AC_MSG_NOTICE([Using libgnurl as HTTP client library.]) - http_client="gnurl" - transport_msg="$transport_msg http_client"]) + http_client="gnurl"]) AS_IF([test "x$curl" = "xtrue" -a "x$curl_gnutls" != "xtrue"], [AC_MSG_WARN([libcurl TLS backend is not gnutls. The GNS Proxy will likely not function properly.]) http_client="curl-openssl"], @@ -2167,14 +2150,12 @@ PostgreSQL: ${postgres_msg} sqlite3: ${sqlite_msg} http client: ${http_client} bluetooth: ${bluetooth_msg} -jansson: ${jansson_msg} iptables: ${iptables_msg} ifconfig: ${ifconfig_msg} upnpc: ${upnpc_msg} gnutls: ${gnutls_msg} libzbar: ${libzbar_msg} java: ${java_msg} -libmicrohttpd: ${libmicrohttpd_msg} libidn: ${libidn1_msg}${libidn2_msg} libopus: ${libopus_msg} gstreamer: ${gstreamer_msg} @@ -2186,9 +2167,7 @@ mandoc: ${mandoc_msg} GNUnet configuration: ===================== transports: ${transport_msg} -reclaimID: ${reclaim_msg} conversation: ${conversation_msg} -rest: ${rest_msg} database backends: ${features_msg} experimental: ${experimental_msg} -- cgit v1.2.3