aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schanzenbach <mschanzenbach@posteo.de>2020-05-17 19:56:12 +0200
committerMartin Schanzenbach <mschanzenbach@posteo.de>2020-05-17 19:56:12 +0200
commit3362a671f77099f9f53cb998a45eec073576391a (patch)
tree698dec060088cdd3de5e343b27d16724d9a08f33
parentac7ba670425e9d055cffedbec29df40566341afd (diff)
downloadgnunet-3362a671f77099f9f53cb998a45eec073576391a.tar.gz
gnunet-3362a671f77099f9f53cb998a45eec073576391a.zip
make mhd and jansson mandatory dependencies
-rw-r--r--README7
-rw-r--r--configure.ac35
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:
63- gettext 63- gettext
64- gnutls >= 3.2.12 (highly recommended a gnutls 64- gnutls >= 3.2.12 (highly recommended a gnutls
65 linked against libunbound) 65 linked against libunbound)
66- A curl build against gnutls, or gnurl: 66- curl (ideally built against gnutls) or gnurl:
67 * libgnurl >= 7.35.0 (recommended, available from 67 * libgnurl >= 7.35.0 (recommended, available from
68 https://gnunet.org/en/gnurl.html) 68 https://gnunet.org/en/gnurl.html)
69 or 69 or
@@ -74,8 +74,8 @@ These are the direct dependencies for running GNUnet:
74 * libidn2 (prefered) 74 * libidn2 (prefered)
75 or 75 or
76 * libidn >= 1.0 76 * libidn >= 1.0
77- libmicrohttpd >= 0.9.63 (strongly recommended for 77- libmicrohttpd >= 0.9.63
78 a wide range of features) 78- libjansson
79- makeinfo >= 4.8 79- makeinfo >= 4.8
80- make[*3] 80- make[*3]
81- nss (certutil binary, for 81- nss (certutil binary, for
@@ -124,7 +124,6 @@ These are the optional dependencies:
124- bluez (for bluetooth support) 124- bluez (for bluetooth support)
125- grof (for linting of man pages) 125- grof (for linting of man pages)
126- libextractor >= 0.6.1 (highly recommended[*5]) 126- libextractor >= 0.6.1 (highly recommended[*5])
127- libjansson
128- libopus >= 1.0.1 (for conversation tool) 127- libopus >= 1.0.1 (for conversation tool)
129- libpulse >= 2.0 (for conversation tool) 128- libpulse >= 2.0 (for conversation tool)
130- libogg >= 1.3.0 (for conversation tool) 129- 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,
786 ], 786 ],
787 [AC_MSG_RESULT([--with-jansson not specified]) 787 [AC_MSG_RESULT([--with-jansson not specified])
788 CHECK_LIBHEADER(JANSSON, jansson, json_loads, jansson.h,jansson=1,)]) 788 CHECK_LIBHEADER(JANSSON, jansson, json_loads, jansson.h,jansson=1,)])
789AM_CONDITIONAL(HAVE_JANSSON, [test "$jansson" = 1])
790AM_CONDITIONAL(HAVE_JSON, [test x$jansson = x1])
791AS_IF([test "x$jansson" = x1],
792 [AC_DEFINE([HAVE_JANSSON],[1],[Have jansson library])],
793 [AC_DEFINE([HAVE_JANSSON],[0],[Lacking jansson library])])
794 789
790AS_IF([test "x$jansson" != x1],
791 [AC_MSG_ERROR([GNUnet requires libjansson])])
795 792
796# check for libpulse(audio) library 793# check for libpulse(audio) library
797pulse=0 794pulse=0
@@ -1472,6 +1469,9 @@ AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd])
1472 1469
1473AM_CONDITIONAL(HAVE_JSON, [test x$jansson = x1]) 1470AM_CONDITIONAL(HAVE_JSON, [test x$jansson = x1])
1474AM_CONDITIONAL(HAVE_REST, [test x$jansson = x1 -a x$lmhd = x1]) 1471AM_CONDITIONAL(HAVE_REST, [test x$jansson = x1 -a x$lmhd = x1])
1472AS_IF([test "x$lmhd" != "x1"],
1473 [AC_MSG_ERROR([GNUnet requires libmicrohttpd >= 0.9.63.])])
1474
1475 1475
1476# restore LIBS 1476# restore LIBS
1477LIBS=$SAVE_LIBS 1477LIBS=$SAVE_LIBS
@@ -2001,7 +2001,7 @@ AS_IF([test "x$enable_java_ports" = "xyes"],
2001#### This could be moved to the checks above, 2001#### This could be moved to the checks above,
2002#### but for now let's keep it here. 2002#### but for now let's keep it here.
2003#### 2003####
2004transport_msg="tcp udp unix" 2004transport_msg="tcp udp unix http"
2005AS_IF([test "x$build_target" = "xlinux" -a "x$enable_experimental" = "xyes"], 2005AS_IF([test "x$build_target" = "xlinux" -a "x$enable_experimental" = "xyes"],
2006 [transport_msg="$transport_msg wlan"]) 2006 [transport_msg="$transport_msg wlan"])
2007# -- print message regarding enabled experimental features 2007# -- print message regarding enabled experimental features
@@ -2047,26 +2047,10 @@ AS_IF([test "x$conversation_backend" = "xnone"],
2047 [AS_IF([test "x$opus" = x1], 2047 [AS_IF([test "x$opus" = x1],
2048 [conversation_msg="yes (x$conversation_backend)"], 2048 [conversation_msg="yes (x$conversation_backend)"],
2049 [AC_MSG_WARN([libopus not found (required to build conversation)])])]) 2049 [AC_MSG_WARN([libopus not found (required to build conversation)])])])
2050# -- rest / oidc
2051rest_msg="no"
2052AS_IF([test "x$lmhd" = "x1" -a "x$jansson" = "x1"],
2053 [rest_msg="yes"
2054 reclaim_msg="yes (with OpenID Connect)"],
2055 [rest_msg="no"
2056 reclaim_msg="yes (without OpenID Connect)"])
2057
2058 2050
2059# -- interface 2051# -- interface
2060interface_msg=`echo $DEFAULT_INTERFACE | tr -d \"` 2052interface_msg=`echo $DEFAULT_INTERFACE | tr -d \"`
2061# -- libmicrohttpd
2062AS_IF([test "x$lmhd" = "x0"],
2063 [libmicrohttpd_msg="no (REST service and HTTP transport will not be built)"],
2064 [libmicrohttpd_msg="yes"
2065 transport_msg="$transport_msg http_server"])
2066# -- jansson 2053# -- jansson
2067AS_IF([test "x$jansson" = "x0"],
2068 [jansson_msg="no (REST service will not be built)"],
2069 [jansson_msg="yes"])
2070# -- libextractor 2054# -- libextractor
2071AS_IF([test "$extractor" != 1], 2055AS_IF([test "$extractor" != 1],
2072 [AC_MSG_WARN([libextractor not found, but various file-sharing functions require it])], 2056 [AC_MSG_WARN([libextractor not found, but various file-sharing functions require it])],
@@ -2084,8 +2068,7 @@ AS_IF([test "$gnurl" = "0"],
2084 [AC_MSG_NOTICE([Using libcurl as HTTP client library.]) 2068 [AC_MSG_NOTICE([Using libcurl as HTTP client library.])
2085 http_client="curl"])], 2069 http_client="curl"])],
2086 [AC_MSG_NOTICE([Using libgnurl as HTTP client library.]) 2070 [AC_MSG_NOTICE([Using libgnurl as HTTP client library.])
2087 http_client="gnurl" 2071 http_client="gnurl"])
2088 transport_msg="$transport_msg http_client"])
2089AS_IF([test "x$curl" = "xtrue" -a "x$curl_gnutls" != "xtrue"], 2072AS_IF([test "x$curl" = "xtrue" -a "x$curl_gnutls" != "xtrue"],
2090 [AC_MSG_WARN([libcurl TLS backend is not gnutls. The GNS Proxy will likely not function properly.]) 2073 [AC_MSG_WARN([libcurl TLS backend is not gnutls. The GNS Proxy will likely not function properly.])
2091 http_client="curl-openssl"], 2074 http_client="curl-openssl"],
@@ -2167,14 +2150,12 @@ PostgreSQL: ${postgres_msg}
2167sqlite3: ${sqlite_msg} 2150sqlite3: ${sqlite_msg}
2168http client: ${http_client} 2151http client: ${http_client}
2169bluetooth: ${bluetooth_msg} 2152bluetooth: ${bluetooth_msg}
2170jansson: ${jansson_msg}
2171iptables: ${iptables_msg} 2153iptables: ${iptables_msg}
2172ifconfig: ${ifconfig_msg} 2154ifconfig: ${ifconfig_msg}
2173upnpc: ${upnpc_msg} 2155upnpc: ${upnpc_msg}
2174gnutls: ${gnutls_msg} 2156gnutls: ${gnutls_msg}
2175libzbar: ${libzbar_msg} 2157libzbar: ${libzbar_msg}
2176java: ${java_msg} 2158java: ${java_msg}
2177libmicrohttpd: ${libmicrohttpd_msg}
2178libidn: ${libidn1_msg}${libidn2_msg} 2159libidn: ${libidn1_msg}${libidn2_msg}
2179libopus: ${libopus_msg} 2160libopus: ${libopus_msg}
2180gstreamer: ${gstreamer_msg} 2161gstreamer: ${gstreamer_msg}
@@ -2186,9 +2167,7 @@ mandoc: ${mandoc_msg}
2186GNUnet configuration: 2167GNUnet configuration:
2187===================== 2168=====================
2188transports: ${transport_msg} 2169transports: ${transport_msg}
2189reclaimID: ${reclaim_msg}
2190conversation: ${conversation_msg} 2170conversation: ${conversation_msg}
2191rest: ${rest_msg}
2192database backends: ${features_msg} 2171database backends: ${features_msg}
2193experimental: ${experimental_msg} 2172experimental: ${experimental_msg}
2194 2173