X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=7c10d07f163c7f1aaf2fbc52e421ef01afd09c93;hb=7c8c596991f6397ec3ca1911638acb2de721c7a7;hp=b16019f6235a37146f6e744e14be93b5dcbc871f;hpb=bbb2f3b164daf9cc6d03a0f7a9d3184fc9d06e73;p=oweals%2Fgnunet.git diff --git a/configure.ac b/configure.ac index b16019f62..7c10d07f1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # This file is part of GNUnet. -# (C) 2001--2015 Christian Grothoff (and other contributing authors) +# (C) 2001--2016 GNUnet e.V. # # GNUnet is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published @@ -13,8 +13,8 @@ # # You should have received a copy of the GNU General Public License # along with GNUnet; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. # # # Process this file with autoconf to produce a configure script. @@ -34,7 +34,7 @@ AC_CONFIG_HEADERS([gnunet_config.h]) AH_TOP([#define _GNU_SOURCE 1]) AC_CONFIG_MACRO_DIR([m4]) AC_PROG_AWK -AC_PROG_CC +AC_PROG_CC_C99 AC_PROG_CPP AC_PROG_CXX AC_PROG_OBJC @@ -50,11 +50,6 @@ AC_SYS_LARGEFILE AC_FUNC_FSEEKO -if test "$enable_shared" = "no" -then - AC_MSG_ERROR([GNUnet only works with shared libraries. Sorry.]) -fi - CFLAGS="-Wall $CFLAGS" # use '-fno-strict-aliasing', but only if the compiler can take it if gcc -fno-strict-aliasing -S -o /dev/null -xc /dev/null >/dev/null 2>&1; @@ -205,6 +200,10 @@ 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_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_CHECK_MEMBER(struct tm.tm_gmtoff, @@ -270,6 +269,13 @@ AC_ARG_ENABLE(linker-hardening, fi]) +AC_ARG_ENABLE(sanitizer, + AS_HELP_STRING(--enable-sanitizer, enable Address Sanitizer and Undefined Behavior Sanitizer), +[if test x$enableval = xyes; then + LDFLAGS="$CFLAGS -fsanitize=address,undefined -fno-omit-frame-pointer" +fi]) + + extra_logging=GNUNET_NO AC_ARG_ENABLE([logging], AS_HELP_STRING([--enable-logging@<:@=value@:>@],[Enable logging calls. Possible values: yes,no,verbose,veryverbose ('yes' is the default)]), @@ -365,37 +371,49 @@ AC_RUN_IFELSE( then AC_MSG_FAILURE([libgcrypt header version does not match library version]) fi - ]) + ], + [AC_MSG_RESULT([cross compiling, test skipped])]) AC_LANG_POP(C) fi # $build = $target # check for bluetooth library bluetooth=0 AC_CHECK_LIB(bluetooth, ba2str,[AC_CHECK_HEADER([bluetooth/bluetooth.h],bluetooth=1)]) +if test "$build_target" = "mingw" +then + bluetooth=1 +fi +AM_CONDITIONAL(HAVE_LIBBLUETOOTH, [test "$bluetooth" = 1]) if test "$bluetooth" = 1 then - AM_CONDITIONAL(HAVE_LIBBLUETOOTH, true) AC_DEFINE([HAVE_LIBBLUETOOTH],[1],[Have bluetooth library]) else - AM_CONDITIONAL(HAVE_LIBBLUETOOTH, false) + AC_DEFINE([HAVE_LIBBLUETOOTH],[0],[Lacking bluetooth library]) fi -if test "$build_target" = "mingw" + +# check for jansson library +jansson=0 +AC_CHECK_HEADER([jansson.h],jansson=1) +AM_CONDITIONAL(HAVE_JANSSON, [test "$jansson" = 1]) +if test "x$jansson" = x1 then - bluetooth=1 + AC_DEFINE([HAVE_JANSSON],[1],[Have jansson library]) +else + AC_DEFINE([HAVE_JANSSON],[0],[Lacking jansson library]) fi # check for libpulse(audio) library pulse=0 AC_CHECK_LIB(pulse,pa_stream_peek, [AC_CHECK_HEADER([pulse/simple.h],pulse=1)]) -if test "$pulse" = 1 -then - AC_DEFINE([HAVE_PULSE],[1],[Have libpulse(audio) library]) -fi if test "$build_target" = "mingw" then pulse=0 fi +if test "$pulse" = 1 +then + AC_DEFINE([HAVE_PULSE],[1],[Have libpulse(audio) library]) +fi # check for libopus(audio) library opus=0 @@ -444,15 +462,19 @@ then conversation_backend=none AM_CONDITIONAL(BUILD_PULSE_HELPERS, false) AM_CONDITIONAL(BUILD_GST_HELPERS, false) + AM_CONDITIONAL(BUILD_EXPERIMENTAL_HELPERS, false) else - conversation_backend=gst - AM_CONDITIONAL(BUILD_PULSE_HELPERS, false) - AM_CONDITIONAL(BUILD_GST_HELPERS, true) + conversation_backend=gst + AM_CONDITIONAL(BUILD_PULSE_HELPERS, false) + AM_CONDITIONAL(BUILD_GST_HELPERS, true) + AM_CONDITIONAL(BUILD_EXPERIMENTAL_HELPERS, false) fi else + conversation_backend=pulse AM_CONDITIONAL(BUILD_PULSE_HELPERS, true) AM_CONDITIONAL(BUILD_GST_HELPERS, false) + AM_CONDITIONAL(BUILD_EXPERIMENTAL_HELPERS, false) fi # libgnurl @@ -463,26 +485,44 @@ then AC_DEFINE([HAVE_LIBGNURL],[1],[Have libgnurl]) else AM_CONDITIONAL(HAVE_LIBGNURL, false) + AC_DEFINE([HAVE_LIBGNURL],[0],[Lacking libgnurl]) fi +SAVE_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$LIBGNURL_CPPFLAGS $LIBCURL_CPPFLAGS $CPPFLAGS" +LIBS="$LIBGNURL $LIBCURL $LIBS" + # libcurl-gnutls LIBCURL_CHECK_CONFIG(,7.34.0,[curl=true],[curl=false]) if test "x$curl" = xtrue then + AC_CHECK_HEADERS([curl/curl.h], - AC_CHECK_DECLS(CURLINFO_TLS_SESSION,[curl=true],[curl=false],[[#include ]]), - [curl=false]) + AC_CHECK_DECLS(CURLINFO_TLS_SESSION,[curl=true],[curl=false],[[#include ]]), + [curl=false]) + AC_CHECK_HEADERS([gnurl/curl.h], + AC_CHECK_DECLS(CURLINFO_TLS_SESSION,[curl=true],,[[#include ]])) # need libcurl-gnutls.so, everything else is not acceptable AC_CHECK_LIB([curl-gnutls],[curl_easy_getinfo],,[curl=false]) # cURL must support CURLINFO_TLS_SESSION, version >= 7.34 - fi + +# Check for curl/curl.h and gnurl/curl.h so we can use #ifdef +# HAVE_CURL_CURL_H later (the above LIBCURL_CHECK_CONFIG accepted +# *either* header set). +AC_CHECK_HEADERS([curl/curl.h],, + curl=false + AC_CHECK_HEADERS([gnurl/curl.h],, + gnurl=false)) + + + if test x$curl = xfalse then AM_CONDITIONAL(HAVE_LIBCURL, false) if test "$gnurl" = 0 then - AC_MSG_WARN([GNUnet requires libcurl-gnutls >= 7.34]) + AC_MSG_WARN([GNUnet requires libcurl-gnutls or gnurl >= 7.34]) fi else AM_CONDITIONAL(HAVE_LIBCURL, true) @@ -490,30 +530,9 @@ else fi -# libidn -AC_MSG_CHECKING([if Libidn can be used]) -AC_ARG_WITH(libidn, AC_HELP_STRING([--with-libidn=[DIR]], - [Support IDN (needs GNU Libidn)]), -libidn=$withval, libidn=yes) -if test "$libidn" != "no"; then - if test "$libidn" != "yes"; then - LDFLAGS="${LDFLAGS} -L$libidn/lib" - CPPFLAGS="${CPPFLAGS} -I$libidn/include" - fi -fi -libidn=no -AC_CHECK_HEADER(idna.h, - AC_CHECK_LIB(idn, stringprep_check_version, - [libidn=yes LIBS="${LIBS} -lidn"], []), []) -if test "$libidn" != "yes"; then - AC_MSG_FAILURE([GNUnet requires libidn. -libidn-1.13 should be sufficient, newer versions work too.]) -fi -AC_MSG_RESULT($libidn) - -# restore LIBS +# restore LIBS & CPPFLAGS LIBS=$SAVE_LIBS - +CPPFLAGS=$SAVE_CPPFLAGS AC_CHECK_HEADERS([glpk.h],[glpk=true],[gplk=false]) # GLPK must support glpk_init_env, version >= 4.43 @@ -551,16 +570,18 @@ AC_CHECK_LIB([kstat],[kstat_open]) # for GNU Taler wallets? AC_MSG_CHECKING(whether to compile GNU Taler Wallet library ONLY) AC_ARG_ENABLE([taler-wallet], - [AS_HELP_STRING([--taler-wallet], [only compile for Taler wallet])], + [AS_HELP_STRING([--enable-taler-wallet], [only compile for Taler wallet])], [taler_only=${enableval}], [taler_only=no]) AC_MSG_RESULT($taler_only) -AM_CONDITIONAL([TALER_ONLY], [test "x$taler_only" = "xyes"]) - -if test "$taler_only" != yes +if test "x$taler_only" = "xyes" then - - + AM_CONDITIONAL([TALER_ONLY],true) + AC_DEFINE([TALER_WALLET_ONLY],[1],[Compiling for Taler wallet]) +else + AM_CONDITIONAL([TALER_ONLY],false) + AC_DEFINE([TALER_WALLET_ONLY],[0],[Canonical compilation]) +fi # test for libextractor extractor=0 @@ -590,14 +611,22 @@ AC_ARG_WITH(extractor, AC_CHECK_HEADERS(extractor.h, AC_CHECK_LIB([extractor], [EXTRACTOR_plugin_add_defaults], extractor=1))]) +# restore LIBS +LIBS=$SAVE_LIBS + if test "$extractor" != 1 then - AC_MSG_ERROR([GNUnet requires libextractor]) + AM_CONDITIONAL(HAVE_LIBEXTRACTOR, false) + AC_DEFINE([HAVE_LIBEXTRACTOR],[0],[Lacking libextractor]) +else + AM_CONDITIONAL(HAVE_LIBEXTRACTOR, true) + AC_DEFINE([HAVE_LIBEXTRACTOR],[1],[Have libextractor]) fi -# restore LIBS -LIBS=$SAVE_LIBS +if test "$taler_only" != yes +then + # Check for libltdl header (#2999) ltdl=0 AC_MSG_CHECKING(for libltdl) @@ -635,16 +664,88 @@ fi # restore LIBS LIBS=$SAVE_LIBS + +# libidn +AC_MSG_CHECKING([if Libidn can be used]) +AC_ARG_WITH(libidn, AC_HELP_STRING([--with-libidn=[DIR]], + [Support IDN (needs GNU Libidn)]), +libidn=$withval, libidn=yes) +if test "$libidn" != "no"; then + if test "$libidn" != "yes"; then + LDFLAGS="${LDFLAGS} -L$libidn/lib" + CPPFLAGS="${CPPFLAGS} -I$libidn/include" + fi +fi +libidn=no +AC_CHECK_HEADER(idna.h, + AC_CHECK_LIB(idn, stringprep_check_version, + [libidn=yes LIBS="${LIBS} -lidn"], []), []) +if test "$libidn" != "yes"; then + AC_MSG_FAILURE([GNUnet requires libidn. +libidn-1.13 should be sufficient, newer versions work too.]) fi +AC_MSG_RESULT($libidn) + + +# test for zlib +SAVE_LDFLAGS=$LDFLAGS +SAVE_CPPFLAGS=$CPPFLAGS +AC_ARG_WITH(zlib, + [ --with-zlib[[=DIR]] use libz in DIR], + [AS_IF([test "$withval" = "no"], + [AC_MSG_ERROR([GNUnet requires zlib])], + [test "$withval" != "yes"], + [ + Z_DIR=$withval + CPPFLAGS="${CPPFLAGS} -I$withval/include" + LDFLAGS="${LDFLAGS} -L$withval/lib" + ]) + ]) +AC_CHECK_HEADER(zlib.h, + [], + [AC_MSG_ERROR([GNUnet requires zlib])]) +AC_CHECK_LIB(z, compress2, + [ + AC_DEFINE([HAVE_ZLIB], [], [Have compression library]) + if test "x${Z_DIR}" != "x"; then + Z_CFLAGS="-I${Z_DIR}/include" + Z_LIBS="-L${Z_DIR}/lib -lz" + else + Z_LIBS="-lz" + fi], + [AC_MSG_ERROR([GNUnet requires zlib])]) +AC_SUBST(Z_CFLAGS) +AC_SUBST(Z_LIBS) + +if test "$enable_shared" = "no" +then + AC_MSG_ERROR([GNUnet only works with shared libraries. Sorry.]) +fi + + + +# restore LIBS +LIBS=$SAVE_LIBS + + +fi + +# check for iconv +AM_ICONV # test for libunistring gl_LIBUNISTRING if test $HAVE_LIBUNISTRING != yes; then AC_MSG_ERROR([GNUnet requires libunistring]) fi -if test $gl_libunistring_hexversion -le 2305; then +# under emscripten, $gl_libunistring_hexversion is undefined +if test "$taler_only" != yes; then +if test "x$gl_libunistring_hexversion" = "x" || test "$gl_libunistring_hexversion" -le 2305; then AC_MSG_ERROR([GNUnet requires libunistring >= 0.9.1.1]) fi +fi +AC_CHECK_HEADERS([unistr.h],,AC_MSG_ERROR([Compiling GNUnet requires unistr.h (from libunistring) to be installed])) + # restore LIBS LIBS=$SAVE_LIBS @@ -660,7 +761,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([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]) +AC_CHECK_HEADERS([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]) # FreeBSD requires something more funky 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],,, @@ -712,41 +813,18 @@ AC_SUBST(SQLITE_LDFLAGS) # test for postgres postgres=false -AX_LIB_POSTGRESQL([]) -if test "$found_postgresql" = "yes"; then - postgres=true +# even running the check for postgres breaks emscripten ... +if test "$taler_only" != yes; then + AX_LIB_POSTGRESQL([]) + if test "$found_postgresql" = "yes"; then + CFLAGS="$CFLAGS $POSTGRESQL_CPPFLAGS" + CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS" + AC_CHECK_HEADERS([libpq-fe.h], + postgres=true) + fi fi AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue) -# test for zlib -SAVE_LDFLAGS=$LDFLAGS -SAVE_CPPFLAGS=$CPPFLAGS -AC_ARG_WITH(zlib, - [ --with-zlib[[=DIR]] use libz in DIR], - [AS_IF([test "$withval" = "no"], - [AC_MSG_ERROR([GNUnet requires zlib])], - [test "$withval" != "yes"], - [ - Z_DIR=$withval - CPPFLAGS="${CPPFLAGS} -I$withval/include" - LDFLAGS="${LDFLAGS} -L$withval/lib" - ]) - ]) -AC_CHECK_HEADER(zlib.h, - [], - [AC_MSG_ERROR([GNUnet requires zlib])]) -AC_CHECK_LIB(z, compress2, - [ - AC_DEFINE([HAVE_ZLIB], [], [Have compression library]) - if test "x${Z_DIR}" != "x"; then - Z_CFLAGS="-I${Z_DIR}/include" - Z_LIBS="-L${Z_DIR}/lib -lz" - else - Z_LIBS="-lz" - fi], - [AC_MSG_ERROR([GNUnet requires zlib])]) -AC_SUBST(Z_CFLAGS) -AC_SUBST(Z_LIBS) LDFLAGS=$SAVE_LDFLAGS CPPFLAGS=$SAVE_CPPFLAGS @@ -768,21 +846,27 @@ SAVE_CPPFLAGS=$CPPFLAGS AC_MSG_CHECKING(for mysql) AC_ARG_WITH(mysql, [ --with-mysql=PFX base of MySQL installation], - [AC_MSG_RESULT("$with_mysql") - if test "$with_mysql" != "no" - then - if test "$with_mysql" != "yes" - then + [AC_MSG_RESULT([$with_mysql]) + case $with_mysql in + no) + ;; + yes|"") + AC_CHECK_HEADERS(mysql/mysql.h, + AC_CHECK_LIB(mysqlclient, mysql_init, + + mysql=true), [], [$CYGWIN_MYSQL_MAGIC]) + ;; + *) LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql $LDFLAGS $ZLIBS" CPPFLAGS="-I$with_mysql/include $CPPFLAGS" - fi - AC_CHECK_HEADERS(mysql/mysql.h, - AC_CHECK_LIB(mysqlclient, mysql_init, - MYSQL_LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql" - MYSQL_CPPFLAGS="-I$with_mysql/include" + AC_CHECK_HEADERS(mysql/mysql.h, + AC_CHECK_LIB(mysqlclient, mysql_init, + MYSQL_LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql" + MYSQL_CPPFLAGS="-I$with_mysql/include" - mysql=true), [], [$CYGWIN_MYSQL_MAGIC]) - fi + mysql=true), [], [$CYGWIN_MYSQL_MAGIC]) + ;; + esac ], [AC_MSG_RESULT([--with-mysql not specified]) if test -d "/usr/lib64/mysql"; then @@ -809,13 +893,14 @@ AC_ARG_ENABLE(mysql-version-check, [ --disable-mysql-version-check do not chec if test "$mysql" = "true" -a "x$enable_mysql_version_check" = "xyes" then AC_MSG_CHECKING(mysql version) - AC_RUN_IFELSE([AC_LANG_PROGRAM( + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( [[$CYGWIN_MYSQL_MAGIC #include ]], - [[if (MYSQL_VERSION_ID < 40100) - return(-1); - else - return(0); + [[ + #if (MYSQL_VERSION_ID < 40100) + #error needs at least version >= 4.1 + #endif + int main () { return 0; } ]]) ],mysql=true,mysql=false) if test "$mysql" = "false" @@ -847,18 +932,22 @@ AC_ARG_WITH(microhttpd, case $with_microhttpd in no) ;; - yes) + yes|"") AC_CHECK_HEADERS([microhttpd.h], AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT, AC_CHECK_LIB([microhttpd], [MHD_get_fdset2], - [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.32]) - AC_RUN_IFELSE([AC_LANG_SOURCE([ + [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.42]) + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ #include "$native_srcdir/src/include/platform.h" #include - int main () { return MHD_VERSION >= 0x0093200 ? 0 : 1; } - ])], [ - AC_MSG_RESULT(ok) - lmhd=1],[AC_MSG_RESULT(failed)],lmhd=0)]), + #if (MHD_VERSION < 0x0094200) + #error needs at least version 0.9.42 + #endif + int main () { return 0; } + ])], + [AC_MSG_RESULT(ok) + lmhd=1], + [AC_MSG_RESULT(failed)])]), [],[#include "$native_srcdir/src/include/platform.h" #include ]),, [#include "$native_srcdir/src/include/platform.h"]) @@ -870,14 +959,18 @@ AC_ARG_WITH(microhttpd, AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT, AC_CHECK_LIB([microhttpd], [MHD_get_fdset2], EXT_LIB_PATH="-L$with_microhttpd/lib $EXT_LIB_PATH" - [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.32]) - AC_RUN_IFELSE([AC_LANG_SOURCE([ + [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.42]) + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ #include "$native_srcdir/src/include/platform.h" #include - int main () { return MHD_VERSION >= 0x0093200 ? 0 : 1; } - ])], [ - AC_MSG_RESULT(ok) - lmhd=1],[AC_MSG_RESULT(failed)],lmhd=0)]), + #if (MHD_VERSION < 0x0094200) + #error needs at least version 0.9.42 + #endif + int main () { return 0; } + ])], + [AC_MSG_RESULT(ok) + lmhd=1], + [AC_MSG_RESULT(failed)])]), [],[#include "$native_srcdir/src/include/platform.h" #include ]),, [#include "$native_srcdir/src/include/platform.h"]) @@ -888,20 +981,24 @@ AC_ARG_WITH(microhttpd, AC_CHECK_HEADERS([microhttpd.h], AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT, AC_CHECK_LIB([microhttpd], [MHD_get_fdset2], - [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.32]) - AC_RUN_IFELSE([AC_LANG_SOURCE([ + [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.42]) + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ #include "$native_srcdir/src/include/platform.h" #include - int main () { return MHD_VERSION >= 0x0093200 ? 0 : 1; } - ])], [ - AC_MSG_RESULT(ok) - lmhd=1],[AC_MSG_RESULT(failed)],lmhd=0)]), + #if (MHD_VERSION < 0x0094200) + #error needs at least version 0.9.42 + #endif + ])], + [AC_MSG_RESULT(ok) + lmhd=1], + [AC_MSG_RESULT(failed)])]), [],[#include "$native_srcdir/src/include/platform.h" #include ]),, [#include "$native_srcdir/src/include/platform.h"])]) 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]) # restore LIBS LIBS=$SAVE_LIBS @@ -912,10 +1009,7 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :]) # check for gettext AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION([0.19.3]) - -# check for iconv -AM_ICONV +AM_GNU_GETTEXT_VERSION([0.18.1]) # Checks for standard typedefs, structures, and compiler characteristics. AC_TYPE_PID_T @@ -953,7 +1047,7 @@ AC_FUNC_VPRINTF AC_HEADER_SYS_WAIT AC_TYPE_OFF_T AC_TYPE_UID_T -AC_CHECK_FUNCS([atoll stat64 strnlen mremap getrlimit setrlimit sysconf initgroups strndup gethostbyname2 getpeerucred getpeereid setresuid $funcstocheck getifaddrs freeifaddrs getresgid mallinfo malloc_size malloc_usable_size getrusage random srandom stat statfs statvfs]) +AC_CHECK_FUNCS([atoll stat64 strnlen mremap getrlimit setrlimit sysconf initgroups strndup gethostbyname2 getpeerucred getpeereid setresuid $funcstocheck getifaddrs freeifaddrs getresgid mallinfo malloc_size malloc_usable_size getrusage random srandom stat statfs statvfs wait4]) # restore LIBS LIBS=$SAVE_LIBS @@ -1239,15 +1333,6 @@ AC_ARG_ENABLE([wachs], AC_MSG_RESULT($enable_wachs) AM_CONDITIONAL([HAVE_WACHS], [test "x$enable_wachs" = "xyes"]) -# REST API -AC_MSG_CHECKING(whether to compile REST API) -AC_ARG_ENABLE([rest], - [AS_HELP_STRING([--enable-rest], [enable REST])], - [enable_rest=${enableval}], - [enable_rest=no]) -AC_MSG_RESULT($enable_rest) -AM_CONDITIONAL([HAVE_REST], [test "x$enable_rest" = "xyes"]) - # should malicious code be compiled (should only be used for testing)? AC_MSG_CHECKING(whether to compile malicious code) AC_ARG_ENABLE([malicious], @@ -1466,6 +1551,7 @@ src/ats/Makefile src/ats/ats.conf src/ats-tool/Makefile src/ats-tests/Makefile +src/auction/Makefile src/block/Makefile src/cadet/Makefile src/cadet/cadet.conf @@ -1475,6 +1561,7 @@ src/consensus/Makefile src/consensus/consensus.conf src/conversation/Makefile src/conversation/conversation.conf +src/curl/Makefile src/datacache/Makefile src/datastore/Makefile src/datastore/datastore.conf @@ -1484,7 +1571,6 @@ src/dns/Makefile src/dns/dns.conf src/dv/Makefile src/dv/dv.conf -src/env/Makefile src/exit/Makefile src/fragmentation/Makefile src/fs/Makefile @@ -1498,15 +1584,21 @@ src/identity/Makefile src/identity/identity.conf src/include/Makefile src/integration-tests/Makefile +src/json/Makefile +src/jsonapi/Makefile src/hostlist/Makefile src/multicast/Makefile src/multicast/multicast.conf +src/my/Makefile src/mysql/Makefile src/namecache/Makefile src/namecache/namecache.conf src/namestore/Makefile src/namestore/namestore.conf src/nat/Makefile +src/nat/nat.conf +src/nat-auto/Makefile +src/nat-auto/nat-auto.conf src/nse/Makefile src/nse/nse.conf src/peerinfo/Makefile @@ -1514,7 +1606,9 @@ src/peerinfo/peerinfo.conf src/peerinfo-tool/Makefile src/peerstore/Makefile src/peerstore/peerstore.conf +src/pq/Makefile src/postgres/Makefile +src/psycutil/Makefile src/psyc/Makefile src/psyc/psyc.conf src/psycstore/Makefile @@ -1528,10 +1622,6 @@ src/rps/Makefile src/rps/rps.conf src/secretsharing/Makefile src/secretsharing/secretsharing.conf -src/sensor/Makefile -src/sensor/sensor.conf -src/sensordashboard/Makefile -src/sensordashboard/sensordashboard.conf src/scalarproduct/Makefile src/scalarproduct/scalarproduct.conf src/set/Makefile @@ -1543,6 +1633,8 @@ src/statistics/statistics.conf src/template/Makefile src/testbed/Makefile src/testbed/testbed.conf +src/testbed-logger/Makefile +src/testbed-logger/testbed-logger.conf src/testing/Makefile src/topology/Makefile src/transport/Makefile @@ -1552,7 +1644,10 @@ src/util/Makefile src/util/resolver.conf src/vpn/Makefile src/vpn/vpn.conf +src/zonemaster/Makefile +src/zonemaster/zonemaster.conf src/rest/Makefile +src/identity-provider/Makefile pkgconfig/Makefile pkgconfig/gnunetarm.pc pkgconfig/gnunetats.pc @@ -1581,6 +1676,7 @@ pkgconfig/gnunetnamestore.pc pkgconfig/gnunetnat.pc pkgconfig/gnunetnse.pc pkgconfig/gnunetpeerinfo.pc +pkgconfig/gnunetpq.pc pkgconfig/gnunetpostgres.pc pkgconfig/gnunetpsyc.pc pkgconfig/gnunetpsycstore.pc @@ -1616,9 +1712,9 @@ then fi # libgnurl -if test "x$gnurl" = "x0" +if test "$gnurl" = "0" then - if test "x$curl" = "x0" + if test "x$curl" = "xfalse" then AC_MSG_NOTICE([NOTICE: 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]) @@ -1634,6 +1730,12 @@ then AC_MSG_NOTICE([NOTICE: bluetooth library not found. bluetooth support will not be compiled.]) fi +# jansson +if test "x$jansson" = "x0" +then + AC_MSG_NOTICE([NOTICE: jansson library not found. json support will not be compiled.]) +fi + #gnutls if test x$gnutls != xtrue then @@ -1674,6 +1776,10 @@ then fi fi +if test "$extractor" != 1 +then + AC_MSG_WARN([NOTICE: libextractor not found, but various file-sharing functions require it]) +fi AC_MSG_NOTICE([NOTICE: Database support is set to MySQL: $mysql, SQLite: $sqlite, Postgres: $postgres]) @@ -1690,9 +1796,9 @@ fi AC_MSG_NOTICE([******************************************** Please make sure NOW that you have created a user and group 'gnunet' -and additionally a group 'gnunetdns': +and additionally a group 'gnunetdns'. On Debian and Ubuntu GNU/Linux, type: addgroup gnunetdns - adduser gnunet + 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 @@ -1709,6 +1815,8 @@ require fresh login to come into effect): "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://gnunet.org/installation + 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