X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=53db0bfaf457bccc203c66c0df75b9cfa30573f6;hb=3ad52c948d69799351c4a98cd04294d470c49e66;hp=ef68f01ee7bd99b6ffbc4b5e99c1e7b0cb9d8d41;hpb=41d6a90e337d6718d37855fb1e0a5537a319d122;p=oweals%2Fgnunet.git diff --git a/configure.ac b/configure.ac index ef68f01ee..53db0bfaf 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.11.8], [bug-gnunet@gnu.org]) AC_CONFIG_AUX_DIR([build-aux]) # check for legacy option that is no longer supported (#5627) and fail hard @@ -43,14 +43,12 @@ AH_TOP([#define _GNU_SOURCE 1]) AC_CONFIG_MACRO_DIR([m4]) AC_PROG_AWK AC_PROG_CC_C99 -AC_PROG_CPP -AC_PROG_CXX AC_PROG_OBJC 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 @@ -62,8 +60,9 @@ AC_FUNC_FSEEKO CFLAGS="-Wall $CFLAGS" +AC_MSG_CHECKING(whether cc can use -fno-strict-aliasing) # use '-fno-strict-aliasing', but only if the compiler can take it -AS_IF([gcc -fno-strict-aliasing -S -o /dev/null -xc /dev/null >/dev/null 2>&1], +AS_IF([$CC -fno-strict-aliasing -S -o /dev/null -xc /dev/null >/dev/null 2>&1], [CFLAGS="-fno-strict-aliasing $CFLAGS"]) # A helper which allows us to check cflags if compiler @@ -133,8 +132,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= @@ -142,17 +139,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 @@ -197,8 +191,13 @@ AC_SUBST(UNIXONLY) AC_MSG_CHECKING([for build target]) AM_CONDITIONAL(DARWIN, test "$build_target" = "darwin") 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") @@ -222,14 +221,23 @@ 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" != :]) @@ -313,14 +321,28 @@ AS_IF([test x"$VAR_UPNPC_BINARY" != x"false"], [AC_DEFINE_UNQUOTED([UPNPC], "$VAR_UPNPC_BINARY", [Path to upnpc binary])], [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) +AM_CONDITIONAL(HAVE_UNCRUSTIFY_BINARY, $UNCRUSTIFY_BINARY) + +# yapf +# TODO: less repetition, add flag to pass name +AC_CHECK_PROGS(YAPF_BINARY, [yapf yapf3.0 yapf3.1 yapf3.2 yapf3.3 yapf3.4 yapf3.5 yapf3.6 yapf3.7 yapf3.8 yapf3.9 yapf4.0], false) +AM_CONDITIONAL(HAVE_YAPF_BINARY, test x$YAPF_BINARY != xfalse) + + AC_CHECK_MEMBER(struct tm.tm_gmtoff, [AC_DEFINE(HAVE_TM_GMTOFF, 1, [Define if struct tm has the tm_gmtoff member.])], , [#include ]) -AC_CHECK_DECLS([_stati64]) - # 'save' libs; only those libs found so far will be # linked against _everywhere_. For the others, we # will be more selective! @@ -349,16 +371,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? @@ -381,7 +411,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. @@ -391,7 +421,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])], @@ -401,8 +431,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], @@ -413,10 +444,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) @@ -426,15 +479,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) @@ -592,15 +644,43 @@ AC_LANG_POP(C) # check for bluetooth library bluetooth=0 -CHECK_LIBHEADER(BLUETOOTH, bluetooth, ba2str, bluetooth/bluetooth.h,bluetooth=1,) -AS_IF([test "$build_target" = "mingw"], - [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, @@ -656,36 +736,124 @@ AS_IF([test "x$jansson" = x1], # 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 "$build_target" = "mingw"], - [pulse=0]) -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"]) # 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], @@ -707,8 +875,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], @@ -716,7 +886,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 @@ -782,20 +953,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], @@ -907,7 +1064,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 @@ -918,6 +1075,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], @@ -926,19 +1086,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], @@ -947,15 +1108,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 @@ -974,8 +1135,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]) @@ -1079,7 +1239,7 @@ AC_CHECK_HEADERS([fcntl.h math.h errno.h ctype.h limits.h stdio.h stdlib.h strin # Checks for headers that are only required on some systems or # opional (and where we do NOT abort if they are not there) -AC_CHECK_HEADERS([stdatomic.h malloc.h malloc/malloc.h malloc/malloc_np.h langinfo.h sys/param.h sys/mount.h sys/statvfs.h sys/select.h sockLib.h sys/mman.h sys/msg.h sys/vfs.h arpa/inet.h fcntl.h libintl.h netdb.h netinet/in.h sys/ioctl.h sys/socket.h sys/time.h unistd.h kstat.h sys/sysinfo.h kvm.h sys/file.h sys/resource.h ifaddrs.h mach/mach.h stddef.h sys/timeb.h terminos.h argz.h ucred.h sys/ucred.h endian.h sys/endian.h execinfo.h byteswap.h]) +AC_CHECK_HEADERS([stdatomic.h malloc.h malloc/malloc.h malloc/malloc_np.h langinfo.h sys/param.h sys/mount.h sys/statvfs.h sys/select.h sockLib.h sys/mman.h sys/msg.h sys/vfs.h arpa/inet.h fcntl.h libintl.h netdb.h netinet/in.h sys/ioctl.h sys/socket.h sys/time.h unistd.h kstat.h sys/sysinfo.h kvm.h sys/file.h sys/resource.h ifaddrs.h mach/mach.h stddef.h sys/timeb.h argz.h ucred.h sys/ucred.h endian.h sys/endian.h execinfo.h byteswap.h]) # FreeBSD requires this for netinet/in_systm.h and netinet/ip.h AC_CHECK_HEADERS([sys/types.h netinet/in_systm.h netinet/in.h netinet/ip.h],,, @@ -1129,9 +1289,9 @@ 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 ... +# even running the check for postgres breaks emscripten AS_IF([test "$taler_only" != yes], [AX_LIB_POSTGRESQL([9.5], [CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS" @@ -1139,8 +1299,11 @@ AS_IF([test "$taler_only" != yes], postgres=true) ], [AC_MSG_RESULT([no postgres])])]) -AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue) +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 @@ -1225,9 +1388,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 @@ -1351,20 +1516,25 @@ DATAROOTDIR=$datarootdir AC_SUBST(DATAROOTDIR) # test for sudo -# TODO: do we need to change anything for "doas" on openbsd? 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])]) + [ --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 "x$SUDO_BINARY" != "x" -o -w /]) +# test for doas +AC_MSG_CHECKING(for doas) +AC_CHECK_PROGS(DOAS_BINARY, [doas], false) +AM_CONDITIONAL(HAVE_DOAS_BINARY, test x$DOAS_BINARY != xfalse) # test for gnunetdns group name GNUNETDNS_GROUP=gnunetdns @@ -1510,7 +1680,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}], @@ -1642,7 +1812,6 @@ doc/man/Makefile doc/doxygen/Makefile doc/handbook/Makefile doc/tutorial/Makefile -lint/Makefile m4/Makefile po/Makefile.in src/Makefile @@ -1681,8 +1850,8 @@ src/gnsrecord/Makefile src/hello/Makefile src/identity/Makefile src/identity/identity.conf -src/credential/Makefile -src/credential/credential.conf +src/abd/Makefile +src/abd/abd.conf src/include/Makefile src/integration-tests/Makefile src/json/Makefile @@ -1795,6 +1964,10 @@ AS_IF([test "x$enable_java_ports" = "xyes"], #### but for now let's keep it here. #### +# TODO: We use "WARNING" too often, we need to clarify what +# TODO: constitutes a WARNING, an ERROR, and a NOTICE, and +# TODO: other message levels. + # -- print message regarding enabled experimental features AS_IF([test "x$enable_experimental" = "xyes"], [experimental_msg="experimental features enabled"]) @@ -1808,10 +1981,20 @@ AS_IF([test "x$working_libidn2" = x1], # -- 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([WARNING: optional texi2mdoc binary not found]) + texi2mdoc_msg="no (optional)"], + [texi2mdoc_msg="yes"]) +# -- mandoc +AS_IF([test "x$MANDOC_BINARY" = "false"], + [AC_MSG_NOTICE([WARNING: optional mandoc binary not found]) + mandoc_msg="no"], + [mandoc_msg="yes"]) # -- texinfo AS_IF([test "x$makeinfo" != "x1"], [texinfo_msg="no"], @@ -1819,15 +2002,15 @@ AS_IF([test "x$makeinfo" != "x1"], # -- conversation 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.]) + [AC_MSG_NOTICE([WARNING: libpulse(audio) not found (required to build conversation against it).]) libpulse_msg="no"], [libpulse_msg="yes"]) AS_IF([test "x$opus" != "x1"], - [AC_MSG_NOTICE([WARNING: libopus not found, conversation will not be built.]) + [AC_MSG_NOTICE([WARNING: libopus not found (conversation)]) libopus_msg="no"], [libopus_msg="yes"]) AS_IF([test "x$gst" != "x1"], - [AC_MSG_NOTICE([WARNING: GStreamer not found, conversation will not be built.]) + [AC_MSG_NOTICE([WARNING: GStreamer not found (required to build conversation against it).]) gstreamer_msg="no"], [gstreamer_msg="yes"])], [features_msg="$features_msg conversation"]) @@ -1843,7 +2026,7 @@ AS_IF([test "x$jansson" = "x0"], [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([WARNING: libextractor not found, but various file-sharing functions require it])], [libextractor_msg="yes"]) # -- libzbar AS_IF([test "x$zbar" = "x1"], @@ -1889,7 +2072,9 @@ AS_IF([test x$gnutls != xtrue], gnutls_msg="yes (without DANE support)"], [gnutls_msg="yes (with DANE support)"])]) # -- databases -AS_IF([test $mysqlfail = true] +# TODO: this always returns true, the check might +# TODO: not be working as intended (for msqlfail). +AS_IF([test x$mysqlfail = "true"] [AC_MSG_NOTICE([WARNING: optional MySQL not found (or too old)])]) AS_IF([test "$mysql" = true], [features_msg="$features_msg mysql" @@ -1913,10 +2098,10 @@ 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 (incomplete!) +GNUnet Configuration gnunet version: ${VERSION} @@ -1951,9 +2136,11 @@ libopus: ${libopus_msg} gstreamer: ${gstreamer_msg} libpulse: ${libpulse_msg} libextractor: ${libextractor_msg} +texi2mdoc: ${texi2mdoc_msg} +mandoc: ${mandoc_msg} texinfo manual: ${texinfo_msg} -transpiled mdoc manual: ${mdoc_msg} +transpiled mdocml manual: ${mdocml_msg} features: ${features_msg} experimental: ${experimental_msg}