X-Git-Url: https://git.librecmc.org/?p=oweals%2Fgnunet.git;a=blobdiff_plain;f=configure.ac;h=6dc914c12cfc042eb094826994e48937341c2a95;hp=7e86b6276160d5115bcd1e8b42e03abb5b7c87ae;hb=HEAD;hpb=f497ba4fe3c613c04f02378831f43664dbed6601 diff --git a/configure.ac b/configure.ac index 7e86b6276..6dc914c12 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ # AC_PREREQ(2.61) # Checks for programs. -AC_INIT([gnunet], [0.11.6], [bug-gnunet@gnu.org]) +AC_INIT([gnunet], [0.12.2], [bug-gnunet@gnu.org]) AC_CONFIG_AUX_DIR([build-aux]) # check for legacy option that is no longer supported (#5627) and fail hard @@ -48,7 +48,7 @@ AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET AM_PROG_CC_C_O -LT_INIT([disable-static dlopen win32-dll]) +LT_INIT([disable-static dlopen]) AC_SUBST(MKDIR_P) # allow for different autotools @@ -97,6 +97,9 @@ AC_DEFUN([CC_CHECK_CFLAG_APPEND], [ # We make heavy use of this, llvm/gcc and gcc-9 give warnings so disable. CC_CHECK_CFLAG_APPEND([address-of-packed-member]) +# We make heavy use of this, llvm/gcc and gcc-9 give warnings so disable. +CC_CHECK_CFLAG_APPEND([tautological-constant-out-of-range-compare]) + # Use Linux interface name unless the OS has a different preference DEFAULT_INTERFACE="\"eth0\"" @@ -132,8 +135,6 @@ AS_CASE(["$host_os"], AC_PATH_XTRA ], [*freebsd*],[ - AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system]) - AC_DEFINE_UNQUOTED(FREEBSD,1,[This is a FreeBSD system]) CFLAGS="-D_THREAD_SAFE $CFLAGS" build_target="freebsd" LIBPREFIX= @@ -141,17 +142,14 @@ AS_CASE(["$host_os"], UNIXONLY="#" ], [*openbsd*],[ - AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system]) - AC_DEFINE_UNQUOTED(OPENBSD,1,[This is an OpenBSD system]) LIBS=`echo $LIBS | sed -e "s/-ldl//"` build_target="openbsd" + use_openbsd_libtool=true LIBPREFIX= DLLDIR=lib UNIXONLY="#" ], [*netbsd*],[ - AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system]) - AC_DEFINE_UNQUOTED(NETBSD,1,[This is a NetBSD system]) build_target="netbsd" LIBPREFIX= DLLDIR=lib @@ -199,6 +197,10 @@ AM_CONDITIONAL(SOLARIS, test "$build_target" = "solaris") AM_CONDITIONAL(XNETBSD, test "$build_target" = "netbsd") AM_CONDITIONAL(XFREEBSD, test "$build_target" = "freebsd") AM_CONDITIONAL(OPENBSD, test "$build_target" = "openbsd") +# FIXME: We need a define BSD for some binaries like we +# need define LINUX for some. This does not scale, how +# can we solve this better? +AM_CONDITIONAL(XBSD, test "$build_target" = "netbsd" -o "$build_target" = "freebsd" -o "$build_target" = "openbsd") AM_CONDITIONAL(LINUX, test "$build_target" = "linux") AM_CONDITIONAL(GNU, test "$build_target" = "gnu") @@ -213,7 +215,7 @@ AC_SEARCH_LIBS([memrchr], [], AC_DEFINE(HAVE_MEMRCHR,1,[memrchr supported]), []) AC_SEARCH_LIBS([memset_s], [], AC_DEFINE(HAVE_MEMSET_S,1,[memset_s supported]), []) -AC_SEARCH_LIBS([memset_s], [], +AC_SEARCH_LIBS([explicit_bzero], [], AC_DEFINE(HAVE_EXPLICIT_BZERO,1,[explicit_bzero supported]), []) AC_CHECK_LIB(socket, socket) AC_CHECK_LIB(m, log) @@ -222,22 +224,63 @@ AC_CHECK_LIB(c, getloadavg, AC_DEFINE(HAVE_GETLOADAVG,1,[getloadavg supported])) AC_CHECK_PROG(VAR_GETOPT_BINARY, getopt, true, false) AM_CONDITIONAL(HAVE_GETOPT_BINARY, $VAR_GETOPT_BINARY) +AC_CHECK_PROGS(PKG_CONFIG, [pkgconf, pkg-config], false) +AM_CONDITIONAL(HAVE_PKG_CONFIG, test x$PKG_CONFIG != xfalse) + AC_CHECK_PROG(VAR_SSH_BINARY, ssh, true, false) AM_CONDITIONAL(HAVE_SSH_BINARY, $VAR_SSH_BINARY) -AM_CONDITIONAL(HAVE_SSH_KEY, ssh -D 12345 -o "BatchMode yes" -o "UserKnownHostsFile /tmp/gnunet_test_cosks_ssh_garbage" -o "StrictHostKeyChecking no" 127.0.0.1 echo -n) -rm -f /tmp/gnunet_test_cosks_ssh_garbage +AC_MSG_CHECKING(for SSH key) + AM_CONDITIONAL(HAVE_SSH_KEY, ssh -D 12345 -o "BatchMode yes" -o "UserKnownHostsFile /tmp/gnunet_test_cosks_ssh_garbage" -o "StrictHostKeyChecking no" 127.0.0.1 echo -n) + if test -f /tmp/gnunet_test_cosks_ssh_garbage; then + rm -f /tmp/gnunet_test_cosks_ssh_garbage + fi + # autotools' m4 for python has no maximum version! -# python3.4 - python3.7 for tests -m4_define_default([_AM_PYTHON_INTERPRETER_LIST],[python3 python3.4 python3.5 python3.6 python3.7 python]) +# python3.4 - python3.8 for tests (3.8 unchecked) +# TODO: document how to override the lowest version +# TODO: found by this. +m4_define_default([_AM_PYTHON_INTERPRETER_LIST],[python3 python3.4 python3.5 python3.6 python3.7 python3.8 python]) AM_PATH_PYTHON([3.4],, [:]) AC_SUBST([PYTHON]) AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :]) + # perl AC_PATH_PROG( PERL, perl, , $PATH:/usr/local/bin/perl:/usr/bin/:/usr/local/bin ) AC_SUBST([PERL]) +AM_CONDITIONAL([HAVE_PERL], [test -x "$PERL"]) +AS_IF([test -x "$PERL"], + [AC_DEFINE_UNQUOTED([HAVE_PERL], [1], [Path to Perl])], + [AC_DEFINE_UNQUOTED([HAVE_PERL], [0], [Path to Perl])]) + +# awk +AC_PATH_PROGS( AWK_BINARY, [awk gawk], ,$PATH:/usr/bin/:/usr/local/bin ) +AC_SUBST([AWK_BINARY]) +AM_CONDITIONAL([HAVE_AWK], [test -x "$AWK_BINARY"]) +AS_IF([test -x "$AWK_BINARY"], + [AC_DEFINE_UNQUOTED([HAVE_AWK], [1], [Path to awk])], + [AC_DEFINE_UNQUOTED([HAVE_AWK], [0], [Path to awk])]) + +# should we install gnunet-logread? +AC_MSG_CHECKING(whether to install gnunet-logread) +AC_ARG_WITH([gnunet-logread], + [AS_HELP_STRING([--with-gnunet-logread], + [Install gnunet-logread])], + [logread=${withval}], + [logread=no]) +AC_MSG_RESULT($logread) +AS_IF([test "x$logread" = "xyes"], + [AM_CONDITIONAL([GNUNET_LOGREAD], true) + AC_DEFINE([GNUNET_LOGREAD], + [1], + [Installing gnunet-logread])], + [AM_CONDITIONAL([GNUNET_LOGREAD], + false) + AC_DEFINE([GNUNET_LOGREAD], + [0], + [Not installing gnunet-logread])]) # iptables is a soft requirement to run tests AC_PATH_TARGET_TOOL(VAR_IPTABLES_BINARY, iptables, false) @@ -294,6 +337,23 @@ AS_IF([test x"$VAR_IFCONFIG_BINARY" != x"false"], [AC_MSG_WARN(['ifconfig' not found.])]) +# Test if 'adduser' binary exists +MSG_USER_SETUP=true +AC_PATH_PROG([MSG_USER_SETUP], + [adduser], + false, + [path=$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin]) + +# Test if 'gnunet' user and the groups exist +getent passwd gnunet > /dev/null +HAVE_GNUNET_USER=$? +getent group gnunet > /dev/null +AS_IF([test x$? != x0], + [HAVE_GNUNET_USER=1]) +getent group gnunetdns > /dev/null +AS_IF([test x$? != x0], + [HAVE_GNUNET_USER=1]) + AC_PATH_TARGET_TOOL(VAR_SYSCTL_BINARY, sysctl, false) AC_CHECK_PROG(VAR_SYSCTL_BINARY, sysctl, true, false) @@ -314,6 +374,10 @@ AS_IF([test x"$VAR_UPNPC_BINARY" != x"false"], [AC_MSG_WARN([warning: 'upnpc' binary not found.])]) +# checkbashisms +AC_CHECK_PROGS(CHECKBASHISMS_BINARY, [checkbashisms checkbashisms.pl], false) +AM_CONDITIONAL(HAVE_CHECKBASHISMS, test x$CHECKBASHISMS_BINARY != xfalse) + # uncrustify # TODO: maybe add flag to pass location AC_CHECK_PROG(UNCRUSTIFY_BINARY, uncrustify, true) @@ -359,16 +423,24 @@ AS_IF([test $gcrypt = 0], AC_MSG_ERROR([[ *** *** You need libgcrypt to build this program. -** This library is for example available at -*** ftp://ftp.gnupg.org/gcrypt/libgcrypt/ -*** (at least version $NEED_LIBGCRYPT_VERSION (API $NEED_LIBGCRYPT_API) -*** is required.) +*** This library is for example available at +*** ftp://ftp.gnupg.org/gcrypt/libgcrypt/. +*** At least version $NEED_LIBGCRYPT_VERSION (API $NEED_LIBGCRYPT_API) +*** is required. ***]]) ]) AC_DEFINE_UNQUOTED([NEED_LIBGCRYPT_VERSION], "$NEED_LIBGCRYPT_VERSION", [required libgcrypt version]) AC_CHECK_DECLS([struct in6_ifreq], [], [], [[#include ]]) +AC_CHECK_HEADER([if_tun.h], + [AC_DEFINE([IF_TUN_HDR], ["if_tun.h"], [if_tun.h include path])], + [AC_CHECK_HEADER([linux/if_tun.h], + [AC_DEFINE([IF_TUN_HDR], ["linux/if_tun.h"])], + [AC_CHECK_HEADER([net/if_tun.h], + [AC_DEFINE([IF_TUN_HDR], ["net/if_tun.h"])], + [AC_CHECK_HEADER([net/tun/if_tun.h], + [AC_DEFINE([IF_TUN_HDR], ["net/tun/if_tun.h"])])])])]) # should the build process be building the documentation? @@ -391,7 +463,7 @@ AS_IF([test "x$documentation" = "xyes"], [0], [Not building the documentation])]) -# COMMENT: Check wether to transpile texinfo to mdoc. +# COMMENT: Check whether to transpile texinfo to mdoc. # COMMENT: This is TRUE when --enable-texi2mdoc-generation # COMMENT: but ERRORS when texi2mdoc binary is missing in your $PATH # COMMENT: and makes the configure fail if it is missing. @@ -401,7 +473,7 @@ AS_IF([test "x$documentation" = "xyes"], # COMMENT: There are 2 nested AS_IFs because we need to catch the # COMMENT: potential non-existence of the texi2mdoc binary. # COMMENT: Default return value / setting: no -AC_MSG_CHECKING(wether to include generated texi2mdoc output in installation) +AC_MSG_CHECKING(whether to include generated texi2mdoc output in installation) AC_ARG_ENABLE([texi2mdoc-generation], [AS_HELP_STRING([--enable-texi2mdoc-generation], [include generated texi2mdoc output in installation])], @@ -411,8 +483,9 @@ AC_MSG_RESULT($texi2mdoc_generation) AS_IF([test "x$texi2mdoc_generation" = "xyes"], [AS_IF([test "$texi2mdoc" = 0], [AC_MSG_WARN([ERROR: transpiled mdoc output requires texi2mdoc.]) - AC_MSG_WARN([ERROR: texi2mdoc can be obtained via your Operating System]) - AC_MSG_WARN([ERROR: package manager or from https://mandoc.bsd.lv/texi2mdoc/])], + AC_MSG_WARN([ERROR: texi2mdoc can be obtained via your]) + AC_MSG_WARN([ERROR: Operating System package manager or from]) + AC_MSG_WARN([ERROR: https://mandoc.bsd.lv/texi2mdoc/])], [AM_CONDITIONAL([TEXI2MDOC_GENERATION],true) AC_DEFINE([TEXI2MDOC_GENERATION], [1], @@ -423,10 +496,32 @@ AS_IF([test "x$texi2mdoc_generation" = "xyes"], [0], [Not building section 7 mdoc output])]) +# test for texi2mdoc (the binary, not the script distributed +# with autogen) +# TODO: refactor this and the check above. +AC_MSG_CHECKING(for texi2mdoc binary) +AC_CHECK_PROGS(TEXI2MDOC_BINARY, [texi2mdoc], false) +AM_CONDITIONAL(HAVE_TEXI2MDOC, test x$TEXI2MDOC_BINARY != xfalse) + +# texi2man is a tool which needs to be investigated and +# is probably incompatible to texi2mdoc in invocation. +# Detection at this point only serves as a reminder that +# I will work this into the build-system. +AC_MSG_CHECKING(for texi2man perl script) +AC_CHECK_PROGS(TEXI2MAN_SCRIPT, [texi2man], false) +AM_CONDITIONAL(HAVE_TEXI2MAN, test x$TEXI2MAN_SCRIPT != xfalse) + + +# test for mandoc +AC_MSG_CHECKING(for mandoc binary) +AC_CHECK_PROGS(MANDOC_BINARY, [mandoc], false) +AM_CONDITIONAL(HAVE_MANDOC, test x$MANDOC_BINARY != xfalse) + # should the build process be building only the documentation? AC_MSG_CHECKING(whether to build only documentation) AC_ARG_ENABLE([documentation-only], - [AS_HELP_STRING([--enable-documentation-only], [build only the documentation])], + [AS_HELP_STRING([--enable-documentation-only], + [build only the documentation])], [documentation_only=${enableval}], [documentation_only=no]) AC_MSG_RESULT($documentation_only) @@ -436,15 +531,14 @@ AS_IF([test "x$documentation_only" = "xyes"], AC_DEFINE([DOCUMENTATION_ONLY],[1],[Building only the documentation]) ],[ AM_CONDITIONAL([DOCUMENTATION_ONLY],false) - # TODO: Double negation might be a bit hard to parse for some - # TODO: people reading the output. - AC_DEFINE([DOCUMENTATION_ONLY],[0],[Not building only the documentation]) + AC_DEFINE([DOCUMENTATION_ONLY],[0],[Doing a normal build, more than only documentation]) ]) # should the build process be including the manpages? (default: yes) AC_MSG_CHECKING(whether to include man pages) AC_ARG_ENABLE([include-manpages], - [AS_HELP_STRING([--disable-include-manpages], [Do not include the man pages in build and installation])], + [AS_HELP_STRING([--disable-include-manpages], + [Do not include the man pages in build and installation])], [include_manpages=${enableval}], [include_manpages=yes]) AC_MSG_RESULT($include_manpages) @@ -480,7 +574,7 @@ AS_IF([test "x$activate_texinfo4" = "xyes"], # Adam shostack suggests the following for Windows: # -D_FORTIFY_SOURCE=2 -fstack-protector-all -AC_ARG_ENABLE(gcc-hardening, +AC_ARG_ENABLE([gcc-hardening], AS_HELP_STRING(--enable-gcc-hardening, enable compiler security checks), [AS_IF([test x$enableval = xyes],[ CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-all" @@ -491,13 +585,13 @@ AC_ARG_ENABLE(gcc-hardening, # Linker hardening options # Currently these options are ELF specific - you can't use this with MacOSX -AC_ARG_ENABLE(linker-hardening, +AC_ARG_ENABLE([linker-hardening], AS_HELP_STRING(--enable-linker-hardening, enable linker security fixups), [AS_IF([test x$enableval = xyes], [LDFLAGS="$LDFLAGS -z relro -z now"])]) -AC_ARG_ENABLE(sanitizer, +AC_ARG_ENABLE([sanitizer], AS_HELP_STRING(--enable-sanitizer, enable Address Sanitizer and Undefined Behavior Sanitizer), [AS_IF([test x$enableval = xyes],[ LDFLAGS="$CFLAGS -fsanitize=address,undefined -fno-omit-frame-pointer" @@ -600,15 +694,53 @@ AC_RUN_IFELSE( AC_LANG_POP(C) ]) # $build = $target +AC_COMPILE_IFELSE([AC_LANG_SOURCE( + [[int main() { + _Static_assert(sizeof(int) >= 4, "not big enough"); + return 0; + };]])], + [AC_DEFINE([HAVE_STATIC_ASSERT],[1],[Static assertions supported])], + [AC_DEFINE([HAVE_STATIC_ASSERT],[0],[Static assertions not supported])]) + # check for bluetooth library bluetooth=0 -CHECK_LIBHEADER(BLUETOOTH, bluetooth, ba2str, bluetooth/bluetooth.h,bluetooth=1,) +AC_MSG_CHECKING(for libbluetooth) +AC_ARG_WITH(libbluetooth, + [ --with-libbluetooth=PREFIX (base of libbluetooth installation)], + [AC_MSG_RESULT([$with_libbluetooth]) + AS_CASE([$with_libbluetooth], + [no],[], + [yes],[ + CHECK_LIBHEADER(BLUETOOTH, + bluetooth, + ba2str, + bluetooth/bluetooth.h, + bluetooth=1,) + ],[ + LDFLAGS="-L$with_libbluetooth/lib $LDFLAGS" + CPPFLAGS="-I$with_libbluetooth/include $CPPFLAGS" + AC_CHECK_HEADERS(bluetooth/bluetooth.h, + AC_CHECK_LIB([bluetooth], + [ba2str], + EXT_LIB_PATH="-L$with_libbluetooth/lib $EXT_LIB_PATH" + bluetooth=1)) + ]) + ], + [AC_MSG_RESULT([--with-libbluetooth not specified]) + CHECK_LIBHEADER(BLUETOOTH, + bluetooth, + ba2str, + bluetooth/bluetooth.h, + bluetooth=1,)]) AM_CONDITIONAL(HAVE_LIBBLUETOOTH, [test "$bluetooth" = 1]) AS_IF([test "$bluetooth" = 1], - [AC_DEFINE([HAVE_LIBBLUETOOTH],[1],[Have bluetooth library])], - [AC_DEFINE([HAVE_LIBBLUETOOTH],[0],[Lacking bluetooth library])]) + [AC_DEFINE([HAVE_LIBBLUETOOTH],[1],[Have bluetooth library])], + [AC_DEFINE([HAVE_LIBBLUETOOTH],[0],[Lacking bluetooth library])]) # check for zbar library +# NOTE: Do not add checks for: -lSM, -lICE, -lX11, -lXv and -ljpeg +# NOTE: they must be provided by the build environment, not the +# NOTE: build-system of gnunet, as they are 2nd or 3rd level dependencies. zbar=0 AC_MSG_CHECKING(for libzbar) AC_ARG_WITH(zbar, @@ -654,44 +786,131 @@ 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 libpulse_msg="no" -CHECK_LIBHEADER(LIBPULSE, pulse, pa_stream_peek, pulse/simple.h,pulse=1,) -AS_IF([test "$pulse" = 1], +AC_MSG_CHECKING(for libpulse) +# TODO: --with-libpulse or --with-pulseaudio? What is more established +# TODO: in this context? +AC_ARG_WITH(libpulse, + [ --with-libpulse=PREFIX (base of libpulse installation)], + [AC_MSG_RESULT([$with_libpulse]) + AS_CASE([$with_libpulse], + [no],[], + [yes],[ + CHECK_LIBHEADER(LIBPULSE, + pulse, + pa_stream_peek, + pulse/simple.h, + pulse=1,) + ],[ + LDFLAGS="-L$with_libpulse/lib $LDFLAGS" + CPPFLAGS="-I$with_libpulse/include $CPPFLAGS" + AC_CHECK_HEADERS(pulse/simple.h, + AC_CHECK_LIB([pulse], + [pa_stream_peek], + EXT_LIB_PATH="-L$with_libpulse/lib $EXT_LIB_PATH" + pulse=1)) + ]) + ], + [AC_MSG_RESULT([--with-libpulse not specified]) + CHECK_LIBHEADER(LIBPULSE, + pulse, + pa_stream_peek, + pulse/simple.h, + pulse=1,)]) +AM_CONDITIONAL(HAVE_PULSE, [test "$pulse" = 1]) +AS_IF([test x"$pulse" = x1], [AC_DEFINE([HAVE_PULSE],[1],[Have libpulse(audio) library]) - libpulse_msg="yes"]) + libpulse_msg="yes"], + [AC_DEFINE([HAVE_PULSE],[0],[Lacking libpulse(audio) library]) + libpulse_msg="no"]) # check for libopus(audio) library opus=0 libopus_msg="no" -CHECK_LIBHEADER(LIBOPUS, - opus, - opus_decode_float, - opus/opus.h, - AC_CHECK_DECL([OPUS_SET_GAIN],[opus=1],[],[[#include ]])) +AC_MSG_CHECKING(for libopus) +AC_ARG_WITH(libopus, + [ --with-libopus=PREFIX (base of libopus installation)], + [AC_MSG_RESULT([$with_libopus]) + AS_CASE([$with_libopus], + [no],[], + [yes],[ + CHECK_LIBHEADER(LIBOPUS, + opus, + opus_decode_float, + opus/opus.h, + AC_CHECK_DECL([OPUS_SET_GAIN], + [opus=1], + [], + [[ + #include + ]])) + ],[ + LDFLAGS="-L$with_libopus/lib $LDFLAGS" + CPPFLAGS="-I$with_libopus/include $CPPFLAGS" + AC_CHECK_HEADERS(opus/opus.h, + AC_CHECK_LIB([opus], + [OPUS_SET_GAIN], + EXT_LIB_PATH="-L$with_libopus/lib $EXT_LIB_PATH" + opus=1)) + ]) + ], + [AC_MSG_RESULT([--with-libopus not specified]) + CHECK_LIBHEADER(LIBOPUS, + opus, + opus_decode_float, + opus/opus.h, + AC_CHECK_DECL([OPUS_SET_GAIN], + [opus=1], + [], + [[ + #include + ]]))]) +AM_CONDITIONAL(HAVE_OPUS, [test "$opus" = 1]) AS_IF([test "x$opus" = x1], [AC_DEFINE([HAVE_OPUS],[1],[Have libopus library]) - libopus_msg="yes"]) + libopus_msg="yes"], + [AC_DEFINE([HAVE_OPUS],[0],[Lacking libopus library]) + libopus_msg="no (required for conversation)"]) # libogg -AC_CHECK_LIB(ogg, ogg_stream_flush_fill, - [AC_CHECK_HEADERS([ogg/ogg.h], - AM_CONDITIONAL(HAVE_OGG, true) - ogg=1 - AC_DEFINE(HAVE_OGG,1,[Have ogg]), - AM_CONDITIONAL(HAVE_OGG, false) - ogg=0 - AC_DEFINE(HAVE_OGG,0,[lacking ogg]))], - AM_CONDITIONAL(HAVE_OGG, false) - ogg=0) +AC_MSG_CHECKING(for libogg) +AC_ARG_WITH(libogg, + [ --with-libogg=PREFIX (base of libogg installation)], + [AC_MSG_RESULT([$with_libogg]) + AS_CASE([$with_libogg], + [no],[], + [yes],[ + CHECK_LIBHEADER(LIBOGG, + ogg, + ogg_stream_flush_fill, + ogg/ogg.h, + ogg=1,) + ],[ + LDFLAGS="-L$with_libogg/lib $LDFLAGS" + CPPFLAGS="-I$with_libogg/include $CPPFLAGS" + AC_CHECK_HEADERS(ogg/ogg.h, + AC_CHECK_LIB([ogg], + [ogg_stream_flush_fill], + EXT_LIB_PATH="-L$with_libogg/lib $EXT_LIB_PATH" + ogg=1)) + ]) + ], + [AC_MSG_RESULT([--with-libogg not specified]) + CHECK_LIBHEADER(LIBOGG, + ogg, + ogg_stream_flush_fill, + ogg/ogg.h, + ogg=1,)]) +AM_CONDITIONAL(HAVE_OGG, [test "$ogg" = 1]) +AS_IF([test x"$ogg" = x1], + [AC_DEFINE([HAVE_OGG],[1],[Have ogg])] + [AC_DEFINE([HAVE_OGG],[0],[Lacking ogg])]) PKG_CHECK_MODULES([GLIB], @@ -713,8 +932,10 @@ PKG_CHECK_MODULES([GLIB], AM_CONDITIONAL(HAVE_ABE, [false]) AC_DEFINE([HAVE_PBC],[0],[Lacking glib library])]) + gst=0 gstreamer_msg="no" +AC_MSG_CHECKING(for gstreamer) PKG_CHECK_MODULES( [GST], [glib-2.0 gobject-2.0 gstreamer-1.0 gstreamer-app-1.0 gstreamer-audio-1.0], @@ -722,7 +943,8 @@ PKG_CHECK_MODULES( gstreamer_msg="yes"], [gst=0]) -# Pulse Audio +# conversation +AC_MSG_CHECKING(conversation feature set to build) AS_IF([test "x$pulse" != "x1" -o "x$opus" != "x1" -o "x$ogg" != "x1"],[ AS_IF([test "x$gst" != "x1"],[ conversation_backend=none @@ -759,8 +981,8 @@ AS_IF([test "x$curl" = xtrue],[ AC_CHECK_HEADER([curl/curl.h], AC_CHECK_DECLS(CURLINFO_TLS_SESSION,[curl=true],[curl=false],[[#include ]]), [curl=false]) - # need libcurl-gnutls.so, everything else is not acceptable - AC_CHECK_LIB([curl-gnutls],[curl_easy_getinfo],,[curl=false]) + # need libcurl-gnutls.so for proxy, warn later if not found. + AC_CHECK_LIB([curl-gnutls],[curl_easy_getinfo],[curl_gnutls=true],[curl_gnutls=false]) # cURL must support CURLINFO_TLS_SESSION, version >= 7.34 ]) @@ -775,7 +997,7 @@ AS_IF([test "$gnurl" = 1], AC_DEFINE([HAVE_LIBGNURL],[0],[Lacking libgnurl]) AM_CONDITIONAL(HAVE_LIBCURL, true) AC_DEFINE([HAVE_LIBCURL],[1],[Have libcurl])], - [AC_MSG_WARN([ERROR: GNUnet requires libcurl-gnutls or gnurl >= 7.34]) + [AC_MSG_ERROR([GNUnet requires libcurl or gnurl >= 7.34]) AM_CONDITIONAL(HAVE_LIBGNURL, false) AC_DEFINE([HAVE_LIBGNURL],[0],[Lacking libgnurl]) AM_CONDITIONAL(HAVE_LIBCURL, false) @@ -788,20 +1010,6 @@ AM_CONDITIONAL(HAVE_LIBATOMIC, [test "$have_libatomic" = 1]) LIBS=$SAVE_LIBS CPPFLAGS=$SAVE_CPPFLAGS -AC_CHECK_HEADERS([glpk.h],[glpk=true],[glpk=false]) -# GLPK must support glpk_init_env, version >= 4.43 -AC_CHECK_LIB([glpk],[glp_init_env],,[glpk=false]) -# GLPK must support atm MLP presolving, version >= 4.32 -AC_CHECK_MEMBERS(glp_iocp.presolve,,[glpk=false],[[#include ]]) -AS_IF([test "x$glpk" = xfalse], -[ - AM_CONDITIONAL(HAVE_LIBGLPK, false) - AC_MSG_WARN([ERROR: GNUnet requires GLPK >= 4.32]) -],[ - AM_CONDITIONAL(HAVE_LIBGLPK, true) - AC_DEFINE([HAVE_LIBGLPK],[1],[Have GLPK]) -]) - AC_CHECK_HEADERS([nss.h],[nss=true],[nss=false]) AS_IF([test x$nss = xfalse], @@ -825,23 +1033,14 @@ AS_IF([test x$nss = xfalse], AC_CHECK_LIB([kvm],[kvm_open]) AC_CHECK_LIB([kstat],[kstat_open]) +libsodium=0 +# test for libsodium +AC_CHECK_HEADER([sodium.h], + [AC_CHECK_LIB([sodium], [crypto_pwhash_argon2id], + [libsodium=1])]) -# should the build process be restricted to the code required -# for GNU Taler wallets? -AC_MSG_CHECKING(whether to compile GNU Taler Wallet library ONLY) -AC_ARG_ENABLE([taler-wallet], - [AS_HELP_STRING([--enable-taler-wallet], [only compile for Taler wallet])], - [taler_only=${enableval}], - [taler_only=no]) -AC_MSG_RESULT($taler_only) -AS_IF([test "x$taler_only" = "xyes"], -[ - AM_CONDITIONAL([TALER_ONLY],true) - AC_DEFINE([TALER_WALLET_ONLY],[1],[Compiling for Taler wallet]) -],[ - AM_CONDITIONAL([TALER_ONLY],false) - AC_DEFINE([TALER_WALLET_ONLY],[0],[Canonical compilation]) -]) +AS_IF([test x$libsodium = x0], + [AC_MSG_ERROR([GNUnet requires libsodium.])]) # test for libextractor extractor=0 @@ -881,9 +1080,6 @@ AS_IF([test "$extractor" != 1], ]) -AS_IF([test "$taler_only" != yes],[ - - # Check for libltdl header (#2999) ltdl=0 AC_MSG_CHECKING(for libltdl) @@ -913,7 +1109,7 @@ AS_IF([test x$ltdl = x1], [ AC_MSG_RESULT([libltdl found]) ],[ - AC_MSG_ERROR([GNUnet requires libltdl (from GNU libtool), try installing libltdl-dev]) + AC_MSG_ERROR([GNUnet requires libltdl (from GNU libtool).]) ]) # restore LIBS LIBS=$SAVE_LIBS @@ -924,6 +1120,9 @@ LIBS=$SAVE_LIBS # if none exist, fail and message that libidn or libidn2 # is required with a preference for libidn2. # TODO: What we have right here can probably be improved. +AC_MSG_CHECKING(for idn or idn2) + +AC_MSG_CHECKING(for idn) my_with_libidn=1 AC_ARG_WITH(libidn, AS_HELP_STRING([--with-libidn=pathname], @@ -932,19 +1131,20 @@ AC_ARG_WITH(libidn, [withval="yes"]) AS_IF([test x_$withval = x_yes], [AC_CHECK_HEADERS([idna.h], - AC_MSG_NOTICE([Found idna.h]), - AC_CHECK_HEADERS([idn/idna.h], - AC_MSG_NOTICE([Found idn/idna.h]), - my_with_libidn=0))], + AC_MSG_NOTICE([Found idna.h]), + AC_CHECK_HEADERS([idn/idna.h], + AC_MSG_NOTICE([Found idn/idna.h]), + my_with_libidn=0))], [AS_IF([test x_$withval != x_no], [CFLAGS="$CFLAGS -I$withval/include" LDFLAGS="$LDFLAGS -L$withval/lib" AC_CHECK_HEADERS([idna.h], - AC_MSG_NOTICE([Found idna.h]), - [AC_MSG_NOTICE([Failed to find idna.h]) - my_with_libidn=0])], + AC_MSG_NOTICE([Found idna.h]), + [AC_MSG_NOTICE([Failed to find idna.h]) + my_with_libidn=0])], [my_with_libidn=0])]) +AC_MSG_CHECKING(for idn2) my_with_libidn2=1 AC_ARG_WITH(libidn2, AS_HELP_STRING([--with-libidn2=pathname], @@ -953,15 +1153,15 @@ AC_ARG_WITH(libidn2, [withval="yes"]) AS_IF([test x_$withval = x_yes], [AC_CHECK_HEADERS([idn2.h], - AC_MSG_NOTICE([Found idn2.h]), - AC_CHECK_HEADERS([idn2/idn2.h], - AC_MSG_NOTICE([Found idn2/idn2.h]), - [AC_MSG_NOTICE([Failed to find idn2.h]) - my_with_libidn2=0]))], + AC_MSG_NOTICE([Found idn2.h]), + AC_CHECK_HEADERS([idn2/idn2.h], + AC_MSG_NOTICE([Found idn2/idn2.h]), + [AC_MSG_NOTICE([Failed to find idn2.h]) + my_with_libidn2=0]))], [AS_IF([test x_$withval != x_no], [CFLAGS="$CFLAGS -I$withval/include" LDFLAGS="$LDFLAGS -L$withval/lib"], - [my_with_libidn2=0])]) + [my_with_libidn2=0])]) AC_MSG_CHECKING([if libidn can be used]) # Check for LIBIDNs @@ -980,8 +1180,7 @@ AS_IF([test x$my_with_libidn2 = x1], [Define to 1 if you have 'libidn2' (-lidn2).])], [MISSING_DEPS="${MISSING_DEPS}${MISSING_SEP}libidn2" MISSING_SEP=", "])]) -AM_CONDITIONAL(HAVE_LIBIDN2, - test x$working_libidn2 = x1) +AM_CONDITIONAL(HAVE_LIBIDN2, test x$working_libidn2 = x1) AS_IF([test x$working_libidn2 = x0], [AS_IF([test x$my_with_libidn = x1], [AC_MSG_NOTICE([Checking for libidn]) @@ -1047,10 +1246,6 @@ AS_IF([test "$enable_shared" = "no"], LIBS=$SAVE_LIBS -# end of taler-only being false -]) - - # check for iconv AM_ICONV @@ -1059,12 +1254,8 @@ gl_LIBUNISTRING AS_IF([test $HAVE_LIBUNISTRING != yes], [AC_MSG_ERROR([GNUnet requires libunistring])]) -# under emscripten, $gl_libunistring_hexversion is undefined -if test "$taler_only" != yes; then - AS_IF([test "x$gl_libunistring_hexversion" = "x" || test "$gl_libunistring_hexversion" -le 2305], [AC_MSG_ERROR([GNUnet requires libunistring >= 0.9.1.1])]) -fi AC_CHECK_HEADERS([unistr.h], , AC_MSG_ERROR([Compiling GNUnet requires unistr.h (from libunistring) to be installed])) @@ -1135,18 +1326,19 @@ AC_SUBST(SQLITE_LDFLAGS) LDFLAGS=$SAVE_LDFLAGS CPPFLAGS=$SAVE_CPPFLAGS -# test for postgres +# test for postgres: postgres=false -# even running the check for postgres breaks emscripten ... -AS_IF([test "$taler_only" != yes], - [AX_LIB_POSTGRESQL([9.5], - [CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS" - AC_CHECK_HEADERS([libpq-fe.h], - postgres=true) - ], - [AC_MSG_RESULT([no postgres])])]) -AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue) +AX_LIB_POSTGRESQL([9.5], + [CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS" + AC_CHECK_HEADERS([libpq-fe.h], + postgres=true) + ], + [AC_MSG_RESULT([no postgres])]) +AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue) +AS_IF([test "x$postgres" = xtrue], + [AC_DEFINE([HAVE_POSTGRESQL],[1],[Have PostgreSQL])], + [AC_DEFINE([HAVE_POSTGRESQL],[0],[Lacking PostgreSQL])]) LDFLAGS=$SAVE_LDFLAGS CPPFLAGS=$SAVE_CPPFLAGS @@ -1215,15 +1407,20 @@ AS_IF([test "$mysql" = "true" -a "x$enable_mysql_version_check" = "xyes"], #endif int main () { return 0; } ]]) - ],mysql=true,mysql=false) - AS_IF([test "$mysql" = "false"], + ], + [mysql=true], + [mysql=false]) + AS_IF([test x$mysql = xfalse], [ mysqlfail=true - AC_MSG_RESULT([fail, >= 4.1 required]) + AC_MSG_WARN([fail, MySQL >= 4.1 required]) ],[ + AC_MSG_NOTICE([success, will keep $mysqlfail]) + mysqlfail=false AC_MSG_RESULT(ok) ]) ]) + AM_CONDITIONAL(HAVE_MYSQL, test x$mysql = xtrue) AM_CONDITIONAL(HAVE_MYSQLE, false) # restore LIBS @@ -1231,9 +1428,11 @@ LIBS=$SAVE_LIBS LDFLAGS=$SAVE_LDFLAGS CPPFLAGS=$SAVE_CPPFLAGS +# TODO: should this test for "or" not "and"? +# TODO: Add postgres? AS_IF([test "$sqlite" = 0 -a "$mysql" = 0], [ - AC_MSG_ERROR([GNUnet requires SQLite or MySQL]) + AC_MSG_ERROR([GNUnet requires SQLite or MySQL / MariaDB.]) ]) # libmicrohttpd @@ -1259,6 +1458,10 @@ AM_CONDITIONAL(HAVE_MHD, test x$lmhd = x1) 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 @@ -1321,20 +1524,6 @@ LIBS=$SAVE_LIBS GN_INTLINCL="" GN_LIBINTL="$LTLIBINTL" -AC_ARG_ENABLE(framework, - [AS_HELP_STRING([--enable-framework],[enable Mac OS X framework build helpers])], - enable_framework_build=$enableval) -AM_CONDITIONAL(WANT_FRAMEWORK, - test x$enable_framework_build = xyes) -AS_IF([test x$enable_framework_build = xyes], - [AC_DEFINE([FRAMEWORK_BUILD], - 1, - [Build a Mac OS X Framework]) - GN_INTLINCL='-I$(top_srcdir)/src/intlemu' - GN_LIBINTL='$(top_builddir)/src/intlemu/libintlemu.la -framework CoreFoundation' - AC_LIB_APPENDTOVAR([CPPFLAGS], - [$GN_INTLINCL])]) - GN_LIB_LDFLAGS="-export-dynamic -no-undefined" GN_PLUGIN_LDFLAGS="-export-dynamic -avoid-version -module -no-undefined" @@ -1358,19 +1547,19 @@ AC_SUBST(DATAROOTDIR) # test for sudo AC_MSG_CHECKING(for sudo) -AC_CHECK_PROGS(SUDO_BINARY, [sudo], false) -AM_CONDITIONAL(HAVE_SUDO, test x$SUDO_BINARY != xfalse) -#AC_ARG_WITH(sudo, -# [ --with-sudo=PATH path to sudo binary (or just yes)], -# [AC_MSG_RESULT("$with_sudo") -# AS_CASE([$with_sudo], -# [no],[SUDO_BINARY=], -# [yes],[SUDO_BINARY=sudo], -# [SUDO_BINARY=$with_sudo])], -# [AC_MSG_RESULT([no])]) -#AC_SUBST(SUDO_BINARY) -#AM_CONDITIONAL([HAVE_SUDO], -# [test "x$SUDO_BINARY" != "x" -o -w /]) +#AC_CHECK_PROGS(SUDO_BINARY, [sudo], false) +#AM_CONDITIONAL(HAVE_SUDO, test x$SUDO_BINARY != xfalse) +AC_ARG_WITH(sudo, + [ --with-sudo=PATH path to sudo binary (or just yes)], + [AC_MSG_RESULT("$with_sudo") + AS_CASE([$with_sudo], + [no],[SUDO_BINARY=], + [yes],[SUDO_BINARY=sudo], + [SUDO_BINARY=$with_sudo])], + [AC_MSG_RESULT([no])]) +AC_SUBST(SUDO_BINARY) +AM_CONDITIONAL([HAVE_SUDO], + [test "x$SUDO_BINARY" != "x" -o -w /]) # test for doas AC_MSG_CHECKING(for doas) @@ -1521,7 +1710,7 @@ AC_MSG_RESULT($enable_benchmarks) AM_CONDITIONAL([HAVE_BENCHMARKS], [test "x$enable_benchmarks" = "xyes"]) # should gnunet-testing be compiled -AC_MSG_CHECKING(wether to compile gnunet-testing) +AC_MSG_CHECKING(whether to compile gnunet-testing) AC_ARG_ENABLE([testing], [AS_HELP_STRING([--disable-testing], [do not build gnunet-testing])], [enable_testing=${enableval}], @@ -1641,6 +1830,7 @@ AC_DEFINE_UNQUOTED(VCS_VERSION, [$vcs_version], [VCS revision/hash or tarball ve AC_CONFIG_FILES([ Makefile +bin/Makefile contrib/Makefile contrib/hellos/Makefile contrib/services/Makefile @@ -1653,7 +1843,6 @@ doc/man/Makefile doc/doxygen/Makefile doc/handbook/Makefile doc/tutorial/Makefile -lint/Makefile m4/Makefile po/Makefile.in src/Makefile @@ -1750,7 +1939,6 @@ src/zonemaster/Makefile src/zonemaster/zonemaster.conf src/rest/Makefile src/abe/Makefile -src/reclaim-attribute/Makefile src/reclaim/Makefile pkgconfig/Makefile pkgconfig/gnunetarm.pc @@ -1797,119 +1985,123 @@ AC_OUTPUT # java ports AS_IF([test "x$enable_java_ports" = "xyes"], - [AC_MSG_NOTICE([NOTICE: Opening ports for gnunet-java bindings by default.])]) + [AC_MSG_NOTICE([Opening TCP ports by default to enable gnunet-java bindings.])]) -#### -#### Lasciate ogne speranza, voi ch'intrate #### #### This could be moved to the checks above, #### but for now let's keep it here. #### - +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 +experimental_msg="no" AS_IF([test "x$enable_experimental" = "xyes"], - [experimental_msg="experimental features enabled"]) -# -- OSX Framework -AS_IF([test "$enable_framework_build" = "yes"], - [macosx_framework_msg="yes"], - [macosx_framework_msg="no"]) + [experimental_msg="yes"]) # -- libidn 2 AS_IF([test "x$working_libidn2" = x1], [libidn2_msg="libidn2"]) # -- libidn 1 AS_IF([test "x$working_libidn1" = x1], [libidn1_msg="libidn1"]) +# -- texi2mdoc-generation +AS_IF([test "x$texi2mdoc_generation" = "xyes"], + [mdocml_msg="yes"], + [mdocml_msg="no"]) # -- texi2mdoc -AS_IF([test "x$texi2mdoc_generation" = x1], - [mdoc_msg="yes"], - [mdoc_msg="no"]) +AS_IF([test "x$TEXI2MDOC_BINARY" = "false"], + [AC_MSG_NOTICE([texi2mdoc binary not found (will not generate mdoc documentation)]) + texi2mdoc_msg="no (optional)"], + [texi2mdoc_msg="yes"]) +# -- mandoc +AS_IF([test "x$MANDOC_BINARY" = "false"], + [AC_MSG_NOTICE([mandoc binary not found (will not generate handbook as man page)]) + mandoc_msg="no"], + [mandoc_msg="yes"]) # -- texinfo AS_IF([test "x$makeinfo" != "x1"], [texinfo_msg="no"], [texinfo_msg="yes"]) # -- conversation +conversation_msg="no" AS_IF([test "x$conversation_backend" = "xnone"], [AS_IF([test "x$pulse" != "x1"], - [AC_MSG_NOTICE([WARNING: libpulse(audio) not found, conversation will not be built.]) - libpulse_msg="no"], + [libpulse_msg="no (required for conversation)"], [libpulse_msg="yes"]) AS_IF([test "x$opus" != "x1"], - [AC_MSG_NOTICE([WARNING: libopus not found, conversation will not be built.]) - libopus_msg="no"], + [libopus_msg="no (required for conversation)"], [libopus_msg="yes"]) AS_IF([test "x$gst" != "x1"], - [AC_MSG_NOTICE([WARNING: GStreamer not found, conversation will not be built.]) - gstreamer_msg="no"], + [gstreamer_msg="no (required for conversation)"], [gstreamer_msg="yes"])], - [features_msg="$features_msg conversation"]) + [AS_IF([test "x$opus" = x1], + [conversation_msg="yes (x$conversation_backend)"], + [AC_MSG_WARN([libopus not found (required to build conversation)])])]) + # -- interface interface_msg=`echo $DEFAULT_INTERFACE | tr -d \"` -# -- libmicrohttpd -AS_IF([test "x$lmhd" != "x1"], - [libmicrohttpd_msg="no (optional)"], - [libmicrohttpd_msg="yes"]) # -- jansson -AS_IF([test "x$jansson" = "x0"], - [jansson_msg="no (optional)"], - [jansson_msg="yes"]) # -- libextractor AS_IF([test "$extractor" != 1], - [AC_MSG_WARN([ERROR: libextractor not found, but various file-sharing functions require it])], + [AC_MSG_WARN([libextractor not found, but various file-sharing functions require it])], [libextractor_msg="yes"]) # -- libzbar AS_IF([test "x$zbar" = "x1"], - [libzbar_msg="yes" - features_msg="$features_msg gnunet-qr"], - [AC_MSG_NOTICE([WARNING: zbar not found, gnunet-qr will not be built.]) - libzbar_msg="no"]) + [libzbar_msg="yes"], + [libzbar_msg="no (gnunet-qr will not be built)"]) # -- libgnurl AS_IF([test "$gnurl" = "0"], [AS_IF([test "x$curl" = "xfalse"], - [AC_MSG_NOTICE([WARNING: libgnurl not found. http client support will not be compiled.]) - AC_MSG_WARN([ERROR: libgnurl not found. hostlist daemon will not be compiled, and you probably WANT the hostlist daemon]) - curl_msg="no"], - [AC_MSG_NOTICE([WARNING: libgnurl not found, trying to use libcurl-gnutls instead.]) - curl_msg="yes"])], - [gnurl_msg="yes"]) + [AC_MSG_WARN([libgnurl not found. http client support will not be compiled.]) + AC_MSG_WARN([IMPORTANT: No HTTP client library found. HTTP transports and hostlist daemon will not be compiled, and you probably WANT the hostlist daemon]) + http_client="none"], + [AC_MSG_NOTICE([Using libcurl as HTTP client library.]) + http_client="curl"])], + [AC_MSG_NOTICE([Using libgnurl as HTTP client library.]) + 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"], + [http_client="curl-gnutls"]) # -- ifconfig AS_IF([test "$VAR_IFCONFIG_BINARY" = "false"], - [AC_MSG_NOTICE([WARNING: optional ifconfig not found]) - ifconfig_msg="no (optional)"], + [ifconfig_msg="no (optional, some features will not work)"], [ifconfig_msg="yes"]) # -- upnpc AS_IF([test "$VAR_UPNPC_BINARY" = "false"], - [AC_MSG_NOTICE([WARNING: optional upnpc binary not found]) - upnpc_msg="no (optional)"], + [upnpc_msg="no (optional, NAT traversal using UPnPc will not work)"], [upnpc_msg="yes"]) # -- iptables AS_IF([test "$VAR_IPTABLES_BINARY" = "false"], - [AC_MSG_NOTICE([WARNING: optional iptables not found]) - iptables_msg="no (optional)"], + [iptables_msg="no (optional, DNS query interception will not work)"], [iptables_msg="yes"]) # -- bluetooth AS_IF([test "x$bluetooth" = "x0"], - [AC_MSG_NOTICE([WARNING: optional bluetooth library not found.]) - bluetooth_msg="no (optional)"], - [bluetooth_msg="yes"]) + [bluetooth_msg="no (optional)"], + [bluetooth_msg="yes" + transport_msg="$transport_msg bluetooth"]) # -- gnutls AS_IF([test x$gnutls != xtrue], - [AC_MSG_NOTICE([WARNING: GnuTLS not found, gnunet-gns-proxy will not be built]) - gnutls_msg="no"], + [AC_MSG_WARN([GnuTLS not found, gnunet-gns-proxy will not be built]) + gnutls_msg="no (gnunet-gns-proxy will not be built)"], [AS_IF([test "x$gnutls_dane" != "x1"], - [AC_MSG_NOTICE([WARNING: GnuTLS has no DANE support, DANE validation will not be possible]) + [AC_MSG_WARN([GnuTLS lacks DANE support, DANE validation will not be possible]) gnutls_msg="yes (without DANE support)"], [gnutls_msg="yes (with DANE support)"])]) # -- databases -AS_IF([test $mysqlfail = true] - [AC_MSG_NOTICE([WARNING: optional MySQL not found (or too old)])]) +# TODO: this always returns true, the check might +# TODO: not be working as intended (for msqlfail). AS_IF([test "$mysql" = true], [features_msg="$features_msg mysql" mysql_msg="yes"], [mysql_msg="no"]) +AS_IF([test x$mysqlfail = xtrue], + [AC_MSG_WARN([MySQL not found (or too old), will not create MySQL database support]) + mysql_msg="unsupported version"]) AS_IF([test "$sqlite" = true], [features_msg="$features_msg sqlite" sqlite_msg="yes"], - [AC_MSG_ERROR([ERROR: sqlite3 not found, but sqlite3 is required.]) + [AC_MSG_ERROR([sqlite3 not found, but sqlite3 is required.]) sqlite_msg="no"]) AS_IF([test "$postgres" = true], [features_msg="$features_msg postgres" @@ -1924,12 +2116,13 @@ AC_SUBST(features_msg) # The summary -# TODO: reduce the length of the last message block ("the message") +# TODO: reduce the length of the last message block, following "IMPORTANT". AC_MSG_NOTICE([ -GNUnet Configuration +Detected system +=============== -gnunet version: ${VERSION} +GNUnet version: ${VERSION} Host setup: ${host} Install prefix: ${prefix} @@ -1939,82 +2132,51 @@ CPPFLAGS: ${CPPFLAGS} LDFLAGS: ${LDFLAGS} LIBS: ${LIBS} Build Target: $build_target -Mac OSX framework build: ${macosx_framework_msg} Default Interface: ${interface_msg} MySQL: ${mysql_msg} PostgreSQL: ${postgres_msg} sqlite3: ${sqlite_msg} -gnurl: ${gnurl_msg} -curl: ${curl_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} libpulse: ${libpulse_msg} libextractor: ${libextractor_msg} - -texinfo manual: ${texinfo_msg} -transpiled mdoc manual: ${mdoc_msg} - -features: ${features_msg} +texi2mdoc: ${texi2mdoc_msg} +mandoc: ${mandoc_msg} + +GNUnet configuration: +===================== +transports: ${transport_msg} +conversation: ${conversation_msg} +database backends: ${features_msg} experimental: ${experimental_msg} - -IMPORTANT: - -Please make sure NOW that you have created a user and group 'gnunet' -and additionally a group 'gnunetdns'. On Debian and Ubuntu GNU/Linux, -type: - - addgroup gnunetdns - adduser --system --group --disabled-login --home /var/lib/gnunet gnunet - -Make sure that '/var/lib/gnunet' is owned (and writable) by user -'gnunet'. Then, you can compile GNUnet with - - make - -After that, run (if necessary as 'root') - - make install - -to install everything. - -Each GNUnet user should be added to the 'gnunet' group (may -require fresh login to come into effect): - - adduser USERNAME gnunet - -(run the above command as root once for each of your users, replacing -"USERNAME" with the respective login names). If you have a global IP -address, no further configuration is required. - -For more detailed setup instructions, see https://docs.gnunet.org/ - -Optionally, download and compile gnunet-gtk to get a GUI for -file-sharing and configuration. This is particularly recommended -if your network setup is non-trivial, as gnunet-setup can be -used to test in the GUI if your network configuration is working. -gnunet-setup should be run as the "gnunet" user under X. As it -does very little with the network, running it as "root" is likely -also harmless. You can also run it as a normal user, but then -you have to copy ~/.gnunet/gnunet.conf" over to the "gnunet" user's -home directory in the end. - -Once you have configured your peer, run (as the 'gnunet' user) - - gnunet-arm -s - -to start the peer. You can then run the various GNUnet-tools as -your "normal" user (who should only be in the group 'gnunet'). +texinfo manual: ${texinfo_msg} +transpiled mdocml manual: ${mdocml_msg} ]) + +AS_IF([test x$MSG_USER_SETUP != xfalse], + [AC_MSG_WARN([Please make sure NOW to create a user and group 'gnunet' and additionally a group 'gnunetdns'. Make sure that '/var/lib/gnunet' is owned (and writable) by user 'gnunet'.]) + AS_IF([test x$HAVE_GNUNET_USER != 0], + [AC_MSG_NOTICE([To do this on this system, run: +# addgroup gnunetdns +# adduser --system --disabled-login --home /var/lib/gnunet gnunet +])]) + AC_MSG_WARN([Each user of GNUnet should be added to the 'gnunet' group.]) + AS_IF([test x$HAVE_GNUNET_USER != 0], + [AC_MSG_NOTICE([To do this on this system, run: +# adduser USERNAME gnunet + for each of your users, replacing \"USERNAME\" with the respective login name. Users may have to login again for the changes to take effect. +])])]) + +AC_MSG_NOTICE([For detailed setup instructions, type 'info gnunet' after the installation or visit https://docs.gnunet.org/])