X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=089f0493c3188027524d37b87b9266fc7fb32e92;hb=331a6079913db5e630c113b0e022c9587499d177;hp=23ca78dbb021f897668f793ab7a7d5b664c4a18d;hpb=5177efb74f9301bbffd79d63f47eb78611e6abba;p=oweals%2Fgnunet.git diff --git a/configure.ac b/configure.ac index 23ca78dbb..089f0493c 100644 --- a/configure.ac +++ b/configure.ac @@ -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\"" @@ -691,6 +694,14 @@ 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 AC_MSG_CHECKING(for libbluetooth) @@ -1025,6 +1036,15 @@ AS_IF([test x$nss = xfalse], AC_CHECK_LIB([kvm],[kvm_open]) AC_CHECK_LIB([kstat],[kstat_open]) +argon=0 +# test for argon2 (for POW) +AC_CHECK_LIB([argon2],[argon2d_hash_raw], argon=1, argon=0) +AS_IF([test x$argon = x1], +[ + AC_MSG_RESULT([argon2 found]) +],[ + AC_MSG_ERROR([GNUnet requires argon2.]) +]) # test for libextractor extractor=0 @@ -1442,6 +1462,7 @@ 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]) # restore LIBS LIBS=$SAVE_LIBS @@ -1504,20 +1525,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" @@ -1933,7 +1940,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 @@ -1986,14 +1992,13 @@ 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" +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"]) @@ -2019,31 +2024,39 @@ 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_WARN([libpulse(audio) not found (required to build conversation).]) - libpulse_msg="no (required for conversation)"], + [libpulse_msg="no (required for conversation)"], [libpulse_msg="yes"]) AS_IF([test "x$opus" != "x1"], - [AC_MSG_WARN([libopus not found (required to build conversation)]) - libopus_msg="no (required for conversation)"], + [libopus_msg="no (required for conversation)"], [libopus_msg="yes"]) AS_IF([test "x$gst" != "x1"], - [AC_MSG_WARN([GStreamer not found (required to build conversation).]) - gstreamer_msg="no (required for conversation)"], + [gstreamer_msg="no (required for conversation)"], [gstreamer_msg="yes"])], [AS_IF([test "x$opus" = x1], - [features_msg="$features_msg conversation"], + [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" != "x1"], - [libmicrohttpd_msg="no (optional)"], - [libmicrohttpd_msg="yes"]) +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 (optional)"], + [jansson_msg="no (REST service will not be built)"], [jansson_msg="yes"]) # -- libextractor AS_IF([test "$extractor" != 1], @@ -2051,10 +2064,8 @@ AS_IF([test "$extractor" != 1], [libextractor_msg="yes"]) # -- libzbar AS_IF([test "x$zbar" = "x1"], - [libzbar_msg="yes" - features_msg="$features_msg gnunet-qr"], - [AC_MSG_NOTICE([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"], @@ -2063,31 +2074,29 @@ AS_IF([test "$gnurl" = "0"], curl_msg="no"], [AC_MSG_NOTICE([libgnurl not found, trying to use libcurl-gnutls instead.]) curl_msg="yes"])], - [gnurl_msg="yes"]) + [gnurl_msg="yes" + transport_msg="$transport_msg http_client"]) # -- ifconfig AS_IF([test "$VAR_IFCONFIG_BINARY" = "false"], - [AC_MSG_WARN([ifconfig not found, some features will not work]) - 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_WARN([upnpc binary not found, NAT traversal using UPnPc will not work]) - 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_WARN([iptables not found, DNS query interception will not work]) - 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([bluetooth library not found, will not be able to use Bluetooth]) - 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_WARN([GnuTLS not found, gnunet-gns-proxy will not be built]) - gnutls_msg="no"], + gnutls_msg="no (gnunet-gns-proxy will not be built)"], [AS_IF([test "x$gnutls_dane" != "x1"], [AC_MSG_WARN([GnuTLS lacks DANE support, DANE validation will not be possible]) gnutls_msg="yes (without DANE support)"], @@ -2123,8 +2132,8 @@ AC_SUBST(features_msg) # TODO: reduce the length of the last message block, following "IMPORTANT". AC_MSG_NOTICE([ -GNUnet Configuration -==================== +Detected system +=============== GNUnet version: ${VERSION} @@ -2136,7 +2145,6 @@ CPPFLAGS: ${CPPFLAGS} LDFLAGS: ${LDFLAGS} LIBS: ${LIBS} Build Target: $build_target -Mac OSX framework build: ${macosx_framework_msg} Default Interface: ${interface_msg} @@ -2162,11 +2170,17 @@ libextractor: ${libextractor_msg} texi2mdoc: ${texi2mdoc_msg} mandoc: ${mandoc_msg} +GNUnet configuration: +===================== +transports: ${transport_msg} +reclaimID: ${reclaim_msg} +conversation: ${conversation_msg} +rest: ${rest_msg} +database backends: ${features_msg} +experimental: ${experimental_msg} + texinfo manual: ${texinfo_msg} transpiled mdocml manual: ${mdocml_msg} - -features: ${features_msg} -experimental: ${experimental_msg} ]) AS_IF([test x$MSG_USER_SETUP != xfalse],