X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=8374c5c7e46d9a11bcb66a5f84bb5831ab526677;hb=f3575010be1a53abe6a27b5e5c4d2d60f46ba805;hp=965c483c3b33cbee8ad9296e525ec6038e8042c6;hpb=28018959b9afc2a8259f35e074869fd88b31b03e;p=oweals%2Fgnunet.git diff --git a/configure.ac b/configure.ac index 965c483c3..8374c5c7e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ # This file is part of GNUnet. -# (C) 2001--2013 Christian Grothoff (and other contributing authors) +# (C) 2001--2014 Christian Grothoff (and other contributing authors) # # GNUnet is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published -# by the Free Software Foundation; either version 2, or (at your +# by the Free Software Foundation; either version 3, or (at your # option) any later version. # # GNUnet is distributed in the hope that it will be useful, but @@ -22,7 +22,7 @@ # AC_PREREQ(2.61) # Checks for programs. -AC_INIT([gnunet], [0.9.5a], [bug-gnunet@gnu.org]) +AC_INIT([gnunet], [0.10.1], [bug-gnunet@gnu.org]) AC_CANONICAL_TARGET AC_CANONICAL_HOST @@ -32,7 +32,7 @@ AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) 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_CPP @@ -75,7 +75,7 @@ case "$host_os" in *darwin* | *rhapsody* | *macosx*) AC_DEFINE_UNQUOTED(DARWIN,1,[This is an Apple Darwin system]) CPPFLAGS="-D_APPLE_C_SOURCE $CPPFLAGS" - CFLAGS="-no-cpp-precomp -fno-common $CFLAGS" + CFLAGS="-fno-common $CFLAGS" AC_MSG_WARN([The VPN application cannot be compiled on your OS]) build_target="darwin" DEFAULT_INTERFACE="\"en0\"" @@ -138,7 +138,6 @@ linux*) AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system]) AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system]) AC_CHECK_LIB(intl, gettext) - LDFLAGS="$LDFLAGS -no-undefined" CFLAGS="-mms-bitfields $CFLAGS" build_target="cygwin" LIBPREFIX=lib @@ -151,7 +150,7 @@ linux*) AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system]) AC_DEFINE_UNQUOTED(_WIN32,1,[This is a Windows system]) AC_CHECK_LIB(intl, gettext) - LDFLAGS="$LDFLAGS -Wl,-no-undefined -Wl,--export-all-symbols" + LDFLAGS="$LDFLAGS -Wl,--export-all-symbols" LIBS="$LIBS -lws2_32 -lplibc -lgnurx -lole32" CFLAGS="-mms-bitfields $CFLAGS" CPPFLAGS="-D_WIN32_WINNT=0x0501 -DHAVE_STAT64=1 -D__USE_MINGW_ANSI_STDIO=1 $CPPFLAGS" @@ -203,17 +202,25 @@ AC_CHECK_LIB(socket, socket) AC_CHECK_LIB(m, log) AC_CHECK_LIB(c, getloadavg, AC_DEFINE(HAVE_GETLOADAVG,1,[getloadavg supported])) + +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! SAVE_LIBS=$LIBS -# libgnurx (regex library for W32) -gnurx=0 -AC_CHECK_LIB(gnurx, regexec, gnurx=1) -if test "x$gnurx" = "x0" -a "x$build_target" = "xmingw" +# tests only run on Windows +if test "x$build_target" = "xmingw" then - AC_MSG_ERROR([on W32 GNUnet needs libgnurx]) + AC_CHECK_LIB(plibc, plibc_init, [], [AC_MSG_ERROR([GNUnet requires PlibC on Windows])]) + AC_CHECK_LIB(gnurx, regexec, [], [AC_MSG_ERROR([GNUnet requires libgnurx on Windows])]) fi # libgcrypt @@ -223,7 +230,7 @@ NEED_LIBGCRYPT_VERSION=1.6.0 AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION", gcrypt=1) -AC_CHECK_DECLS([gcry_mpi_lshift], [], [], [[#include ]]) +AC_CHECK_DECLS([gcry_mpi_set_opaque_copy], [], [], [[#include ]]) if test $gcrypt = 0 then @@ -232,7 +239,7 @@ then *** 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) +*** (at least version $NEED_LIBGCRYPT_VERSION (API $NEED_LIBGCRYPT_API) *** is required.) ***]]) fi @@ -243,7 +250,7 @@ AC_DEFINE_UNQUOTED([NEED_LIBGCRYPT_VERSION], "$NEED_LIBGCRYPT_VERSION", [require AC_ARG_ENABLE(gcc-hardening, AS_HELP_STRING(--enable-gcc-hardening, enable compiler security checks), [if test x$enableval = xyes; then - CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fstack-protector-all" + CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-all" CFLAGS="$CFLAGS -fwrapv -fPIE -Wstack-protector" CFLAGS="$CFLAGS --param ssp-buffer-size=1" LDFLAGS="$LDFLAGS -pie" @@ -296,10 +303,10 @@ AC_LANG_PUSH(C) LIBS="$LIBS $LIBGCRYPT_LIBS" CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS" AC_RUN_IFELSE( - [AC_LANG_PROGRAM([#include + [AC_LANG_PROGRAM([#include #include ], [[ gcry_md_hd_t mac; - + unsigned char data[] = { 0xbf, 0x16, 0x6e, 0x46, 0x3a, 0x6c, 0xf3, 0x93, 0xa7, 0x72, 0x11, 0xa1, 0xdc, 0x0b, 0x07, 0xdb, 0x1a, 0x5e, 0xd9, 0xb9, 0x81, 0xbe, 0xea, 0xe4, 0x31, 0x5f, 0x24, 0xff, 0xfe, 0x50, 0x8a, 0xde }; @@ -310,33 +317,33 @@ AC_RUN_IFELSE( 0xd, 0xba, 0x17, 0x7d, 0xd3, 0x10, 0xb1, 0x37, 0x41, 0x91, 0x7d, 0xeb, 0x1, 0x4d, 0x71, 0xe8, 0x59, 0x71, 0x42, 0x8e, 0xd6, 0xf3, 0x29, 0x3b, 0x90, 0xf2, 0xd1, 0xaf, 0x65, 0x1e, 0xb3}; - + if (!gcry_check_version (GCRYPT_VERSION)) { fprintf (stderr, "Version mismatch %s <-> %s \n", gcry_check_version (NULL), GCRYPT_VERSION); return 1; } - + gcry_control (GCRYCTL_DISABLE_SECMEM, 0); gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); - + if (gcry_md_open(&mac, GCRY_MD_SHA512, GCRY_MD_FLAG_HMAC) != GPG_ERR_NO_ERROR) { fprintf (stderr, "gcry_md_open error\n"); return 2; } - + gcry_md_setkey (mac, key, sizeof (key)); gcry_md_write (mac, data, sizeof (data)); - + if (memcmp(gcry_md_read (mac, 0), result, gcry_md_get_algo_dlen (gcry_md_get_algo (mac))) != 0) { fprintf (stderr, "memcmp error\n"); return 3; } - + gcry_md_close (mac); - + return 0; ]])], [AC_MSG_RESULT([yes])], @@ -360,7 +367,7 @@ fi # $build = $target # check for bluetooth library bluetooth=0 -AC_CHECK_LIB(bluetooth, ba2str, bluetooth=1, bluetooth=0) +AC_CHECK_LIB(bluetooth, ba2str,[AC_CHECK_HEADER([bluetooth/bluetooth.h],bluetooth=1)]) if test "$bluetooth" = 1 then AM_CONDITIONAL(HAVE_LIBBLUETOOTH, true) @@ -373,15 +380,109 @@ then bluetooth=1 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 -# libcurl -LIBCURL_CHECK_CONFIG(,7.21.3,curl=1,curl=0) -if test "$curl" = 1 +# check for libopus(audio) library +opus=0 +AC_CHECK_LIB(opus,opus_decode_float, + [AC_CHECK_HEADER([opus/opus.h], + [AC_CHECK_DECL([OPUS_SET_GAIN],[opus=1],[],[[#include ]] + )] + )] +) +if test "$opus" = 1 then - AM_CONDITIONAL(HAVE_LIBCURL, true) - AC_DEFINE([HAVE_LIBCURL],[1],[Have libcurl]) + AC_DEFINE([HAVE_OPUS],[1],[Have libopus library]) +fi + +# 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) + + + +gst=0 +PKG_CHECK_MODULES( + [GST], + [glib-2.0 gobject-2.0 gstreamer-1.0 gstreamer-app-1.0 gstreamer-audio-1.0], + [ + gst=1 + AC_MSG_RESULT(ok) + ], [ + gst=0 + AC_MSG_RESULT(not found) + ]) + +# Pulse Audio +if test "x$pulse" != "x1" -o "x$opus" != "x1" -o "x$ogg" != "x1" +then + if test "x$gst" != "x1" + then + conversation_backend=none + AM_CONDITIONAL(BUILD_PULSE_HELPERS, false) + AM_CONDITIONAL(BUILD_GST_HELPERS, false) + else + conversation_backend=gst + AM_CONDITIONAL(BUILD_PULSE_HELPERS, false) + AM_CONDITIONAL(BUILD_GST_HELPERS, true) + fi +else + conversation_backend=pulse + AM_CONDITIONAL(BUILD_PULSE_HELPERS, true) + AM_CONDITIONAL(BUILD_GST_HELPERS, false) +fi + +# libgnurl +LIBGNURL_CHECK_CONFIG(,7.34.0,gnurl=1,gnurl=0) +if test "$gnurl" = 1 +then + AM_CONDITIONAL(HAVE_LIBGNURL, true) + AC_DEFINE([HAVE_LIBGNURL],[1],[Have libgnurl]) else + AM_CONDITIONAL(HAVE_LIBGNURL, false) +fi + +# 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]) + # 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 +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]) +fi +else + AM_CONDITIONAL(HAVE_LIBCURL, true) + AC_DEFINE([HAVE_LIBCURL],[1],[Have CURL]) fi @@ -395,11 +496,14 @@ if test "$libidn" != "no"; then LDFLAGS="${LDFLAGS} -L$libidn/lib" CPPFLAGS="${CPPFLAGS} -I$libidn/include" fi - AC_CHECK_HEADER(idna.h, - AC_CHECK_LIB(idn, stringprep_check_version, - [libidn=yes LIBS="${LIBS} -lidn"], - AC_MSG_FAILURE([GNUnet requires libidn])), - AC_MSG_FAILURE([GNUnet requires libidn])) +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) @@ -409,7 +513,7 @@ LIBS=$SAVE_LIBS AC_CHECK_HEADERS([glpk.h],[glpk=true],[gplk=false]) # GLPK must support glpk_init_env, version >= 4.43 -AC_CHECK_LIB([glpk],[glp_init_env],,[gplk=false]) +AC_CHECK_LIB([glpk],[glp_init_env],,[gplk=false]) # GLPK must support atm MLP presolving, version >= 4.32 AC_CHECK_MEMBERS(glp_iocp.presolve,,[gplk=false],[[#include ]]) if test x$gplk = xfalse @@ -533,7 +637,20 @@ 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 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 netinet/in_systm.h netinet/ip.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 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]) + +# 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],,, +[#ifdef HAVE_SYS_TYPES_H +#include +#endif +#ifdef HAVE_NETINET_IN_SYSTM_H +#include +#endif +#ifdef HAVE_NETINET_IN_H +#include +#endif +]) SAVE_LDFLAGS=$LDFLAGS SAVE_CPPFLAGS=$CPPFLAGS @@ -572,35 +689,11 @@ AC_SUBST(SQLITE_LDFLAGS) # test for postgres postgres=false -AC_MSG_CHECKING(for postgres) -AC_ARG_WITH(postgres, - [ --with-postgres=PFX base of postgres installation], - [AC_MSG_RESULT("$with_postgres") - case $with_postgres in - no) - ;; - yes) - AC_CHECK_HEADERS(postgresql/libpq-fe.h, - postgres=true) - ;; - *) - LDFLAGS="-L$with_postgres/lib $LDFLAGS" - CPPFLAGS="-I$with_postgres/include $CPPFLAGS" - AC_CHECK_HEADERS(postgresql/libpq-fe.h, - EXT_LIB_PATH="-L$with_postgres/lib $EXT_LIB_PATH" - POSTGRES_LDFLAGS="-L$with_postgres/lib" - POSTGRES_CPPFLAGS="-I$with_postgres/include" - postgres=true) - LDFLAGS=$SAVE_LDFLAGS - CPPFLAGS=$SAVE_CPPFLAGS - ;; - esac - ], - [AC_MSG_RESULT([--with-postgres not specified]) - AC_CHECK_HEADERS(postgresql/libpq-fe.h, postgres=true)]) -AM_CONDITIONAL(HAVE_POSTGRES, test x$postgres = xtrue) -AC_SUBST(POSTGRES_CPPFLAGS) -AC_SUBST(POSTGRES_LDFLAGS) +AX_LIB_POSTGRESQL([]) +if test "$found_postgresql" = "yes"; then + postgres=true +fi +AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue) # test for zlib SAVE_LDFLAGS=$LDFLAGS @@ -734,15 +827,15 @@ AC_ARG_WITH(microhttpd, yes) AC_CHECK_HEADERS([microhttpd.h], AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT, - AC_CHECK_LIB([microhttpd], [MHD_start_daemon], - [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.31]) + AC_CHECK_LIB([microhttpd], [MHD_get_fdset2], + [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.32]) AC_RUN_IFELSE([AC_LANG_SOURCE([ #include "$native_srcdir/src/include/platform.h" #include - int main () { return MHD_VERSION >= 0x0093002 ? 0 : 1; } + int main () { return MHD_VERSION >= 0x0093200 ? 0 : 1; } ])], [ AC_MSG_RESULT(ok) - lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]), + lmhd=1],[AC_MSG_RESULT(failed)],lmhd=0)]), [],[#include "$native_srcdir/src/include/platform.h" #include ]),, [#include "$native_srcdir/src/include/platform.h"]) @@ -752,16 +845,16 @@ AC_ARG_WITH(microhttpd, CPPFLAGS="-I$with_microhttpd/include $CPPFLAGS" AC_CHECK_HEADERS(microhttpd.h, AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT, - AC_CHECK_LIB([microhttpd], [MHD_start_daemon], + AC_CHECK_LIB([microhttpd], [MHD_get_fdset2], EXT_LIB_PATH="-L$with_microhttpd/lib $EXT_LIB_PATH" - [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.31]) + [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.32]) AC_RUN_IFELSE([AC_LANG_SOURCE([ #include "$native_srcdir/src/include/platform.h" #include - int main () { return MHD_VERSION >= 0x0093002 ? 0 : 1; } + int main () { return MHD_VERSION >= 0x0093200 ? 0 : 1; } ])], [ AC_MSG_RESULT(ok) - lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]), + lmhd=1],[AC_MSG_RESULT(failed)],lmhd=0)]), [],[#include "$native_srcdir/src/include/platform.h" #include ]),, [#include "$native_srcdir/src/include/platform.h"]) @@ -771,15 +864,15 @@ AC_ARG_WITH(microhttpd, [AC_MSG_RESULT([--with-microhttpd not specified]) AC_CHECK_HEADERS([microhttpd.h], AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT, - AC_CHECK_LIB([microhttpd], [MHD_start_daemon], - [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.31]) + AC_CHECK_LIB([microhttpd], [MHD_get_fdset2], + [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.32]) AC_RUN_IFELSE([AC_LANG_SOURCE([ #include "$native_srcdir/src/include/platform.h" #include - int main () { return MHD_VERSION >= 0x0093002 ? 0 : 1; } + int main () { return MHD_VERSION >= 0x0093200 ? 0 : 1; } ])], [ AC_MSG_RESULT(ok) - lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]), + lmhd=1],[AC_MSG_RESULT(failed)],lmhd=0)]), [],[#include "$native_srcdir/src/include/platform.h" #include ]),, [#include "$native_srcdir/src/include/platform.h"])]) @@ -842,28 +935,6 @@ AC_CHECK_FUNCS([atoll stat64 strnlen mremap getrlimit setrlimit sysconf initgrou # restore LIBS LIBS=$SAVE_LIBS -gn_user_home_dir="~/.gnunet" -AC_ARG_WITH(user-home-dir, - AC_HELP_STRING( - [--with-user-home-dir=DIR], - [default user home directory (~/.gnunet)]), - [gn_user_home_dir=$withval]) -AC_SUBST(GN_USER_HOME_DIR, $gn_user_home_dir) -gn_daemon_home_dir="/var/lib/gnunet" -AC_ARG_WITH(daemon-home-dir, - AC_HELP_STRING( - [--with-daemon-home-dir=DIR], - [default daemon home directory (/var/lib/gnunet)]), - [gn_daemon_home_dir=$withval]) -AC_SUBST(GN_DAEMON_HOME_DIR, $gn_daemon_home_dir) -gn_daemon_config_dir="/etc" -AC_ARG_WITH(daemon-config-dir, - AC_HELP_STRING( - [--with-daemon-config-dir=DIR], - [default daemon config directory (/etc)]), - [gn_daemon_config_dir=$withval]) -AC_SUBST(GN_DAEMON_CONFIG_DIR, $gn_daemon_config_dir) - GN_INTLINCL="" GN_LIBINTL="$LTLIBINTL" AC_ARG_ENABLE(framework, [ --enable-framework enable Mac OS X framework build helpers],enable_framework_build=$enableval) @@ -873,7 +944,7 @@ then 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]) + AC_LIB_APPENDTOVAR([CPPFLAGS], [$GN_INTLINCL]) fi GN_LIB_LDFLAGS="-export-dynamic -no-undefined" @@ -977,6 +1048,7 @@ AC_SUBST(GNUNETDNS_GROUP) # gnutls gnutls=0 +gnutls_dane=0 AC_MSG_CHECKING(for gnutls) AC_ARG_WITH(gnutls, [ --with-gnutls=PFX base of gnutls installation], @@ -988,6 +1060,9 @@ AC_ARG_WITH(gnutls, AC_CHECK_HEADERS([gnutls/abstract.h], AC_CHECK_LIB([gnutls], [gnutls_priority_set], gnutls=true)) + AC_CHECK_HEADERS([gnutls/dane.h], + AC_CHECK_LIB([gnutls-dane], [dane_verify_crt_raw], + gnutls_dane=1)) ;; *) LDFLAGS="-L$with_gnutls/lib $LDFLAGS" @@ -996,34 +1071,42 @@ AC_ARG_WITH(gnutls, AC_CHECK_LIB([gnutls], [gnutls_priority_set], EXT_LIB_PATH="-L$with_gnutls/lib $EXT_LIB_PATH" gnutls=true)) + AC_CHECK_HEADERS([gnutls/dane.h], + AC_CHECK_LIB([gnutls-dane], [dane_verify_crt_raw], + gnutls_dane=1)) ;; esac ], [AC_MSG_RESULT([--with-gnutls not specified]) AC_CHECK_HEADERS([gnutls/abstract.h], AC_CHECK_LIB([gnutls], [gnutls_priority_set], - gnutls=true))]) + gnutls=true)) + AC_CHECK_HEADERS([gnutls/dane.h], + AC_CHECK_LIB([gnutls-dane], [dane_verify_crt_raw], + gnutls_dane=1)) + ]) AM_CONDITIONAL(HAVE_GNUTLS, test x$gnutls = xtrue) -AC_DEFINE_UNQUOTED([HAVE_GNUTLS], $gnutls, [We have gnutls]) +AC_DEFINE_UNQUOTED([HAVE_GNUTLS], $gnutls, [We have GnuTLS]) +AM_CONDITIONAL(HAVE_GNUTLS_DANE, test x$gnutls_dane = x1) +AC_DEFINE_UNQUOTED([HAVE_GNUTLS_DANE], $gnutls_dane, [We have GnuTLS with DANE support]) # Test if we are building for superMUC -AC_MSG_CHECKING(if testbed should use IBM LoadLeveler to run on SuperMUC) -AC_ARG_ENABLE([ll], - [AS_HELP_STRING([--enable-ll], - [build GNUnet testbed for use with IBM LoadLeveler for running testbed on - SuperMUC (default is NO)])], - [if test "x$enable_ll" = "xno" +AC_MSG_CHECKING(if GNUnet is being configured to run on the SuperMUC) +AC_ARG_ENABLE([supermuc], + [AS_HELP_STRING([--enable-supermuc], + [build GNUnet with support to run on the SuperMUC (default is NO)])], + [if test "x$enable_supermuc" = "xno" then - ll=0 + supermuc=0 else - ll=1 + supermuc=1 fi], - [ll=0 - enable_ll=no]) -AC_MSG_RESULT($enable_ll) -AM_CONDITIONAL([ENABLE_LL], [test "x$ll" = "x1"]) -AC_DEFINE_UNQUOTED([ENABLE_LL], [$ll], [Build with LL support]) + [supermuc=0 + enable_supermuc=no]) +AC_MSG_RESULT($enable_SUPERMUC) +AM_CONDITIONAL([ENABLE_SUPERMUC], [test "x$supermuc" = "x1"]) +AC_DEFINE_UNQUOTED([ENABLE_SUPERMUC], [$supermuc], [Build with support for SuperMUC]) # Check if NSE has to send timestamp information to testbed logger for # generating histogram of messages received @@ -1124,6 +1207,42 @@ AC_ARG_ENABLE([experimental], AC_MSG_RESULT($enable_experimental) AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"]) +# should malicious code be compiled (should only be used for testing)? +AC_MSG_CHECKING(whether to compile malicious code) +AC_ARG_ENABLE([malicious], + [AS_HELP_STRING([--enable-malicious], [enable compiling malicious code])], + [if test "x$enableval" = "xno" + then + malicious=0 + else + malicious=1 + fi], + [malicious=0 + enable_malicious=no]) +AC_MSG_RESULT($enable_malicious) +AM_CONDITIONAL([ENABLE_MALICIOUS], [1=$malicious]) +AC_DEFINE_UNQUOTED([ENABLE_MALICIOUS], [$malicious], + [enable compilation of malicious code]) + +# should services be started by default when a peer starts? Some services may +# choose to never start by default and it is upto the service/module developer to +# decide it by having "AUTOSTART = NO" instead of "AUTOSTART = @AUTOSTART@" in +# the service/module's conf.in file. +AUTOSTART="YES" +AC_MSG_CHECKING(whether to auto-start peer's services by default) +AC_ARG_ENABLE([autostart], + [AS_HELP_STRING([--disable-autostart], [do not start peer's services by default])], + [enable_autostart=${enableval} + if test "x$enable_autostart" == "xno" + then + AUTOSTART="NO" + fi + ], + [enable_autostart=yes]) +AC_MSG_RESULT($enable_autostart) +#AM_CONDITIONAL([HAVE_AUTOSTART], [test "x$enable_autostart" = "xyes"]) +AC_SUBST(AUTOSTART) + # should memory statistics be kept (very expensive CPU-wise!) AC_MSG_CHECKING(whether to create expensive statistics on memory use) AC_ARG_ENABLE([heapstats], @@ -1230,7 +1349,7 @@ AC_LINK_IFELSE( else AC_MSG_CHECKING(whether to enable windows workarounds) - AC_ARG_ENABLE([windows_workarounds], + AC_ARG_ENABLE([windows_workarounds], [AS_HELP_STRING([--enable-windows_workarounds], [enable workarounds used on Windows (only useful for test cases)])], [enable_workarounds=${enableval}], [enable_workarounds=no]) @@ -1246,10 +1365,10 @@ AC_DEFINE_UNQUOTED([ENABLE_WINDOWS_WORKAROUNDS], $workarounds, [enable workaroun # gcov compilation AC_MSG_CHECKING(whether to compile with support for code coverage analysis) -AC_ARG_ENABLE([coverage], +AC_ARG_ENABLE([coverage], AS_HELP_STRING([--enable-coverage], [compile the library with code coverage support]), - [use_gcov=${enableval}], + [use_gcov=${enableval}], [use_gcov=no]) AC_MSG_RESULT($use_gcov) AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"]) @@ -1258,32 +1377,47 @@ AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"]) # version info AC_PATH_PROG(svnversioncommand, svnversion) AC_PATH_PROG(gitcommand, git) -if test "X$svnversioncommand" = "X" || test `$svnversioncommand -n '.'` = "exported" -then - if test "X$gitcommand" = "X" - then - AC_DEFINE_UNQUOTED(VCS_VERSION, ["release"], [repository svn version]) - else - gitver=$(git log -1 | grep "git-svn-id" | sed -e 's/.*@\([[0-9]]\+\) .*/\1/') - if test "X$gitver" = "X" - then - AC_DEFINE_UNQUOTED(VCS_VERSION, ["release"], [repository svn version]) - else - AC_DEFINE_UNQUOTED(VCS_VERSION, ["svn-$gitver"], [repository svn version]) - fi - fi -else - AC_DEFINE_UNQUOTED(VCS_VERSION, ["svn-`svnversion -n`"], [repository svn version]) -fi +AC_MSG_CHECKING(for source being under a VCS) +svn_version= +gitsvn_version= +AS_IF([test ! "X$svnversioncommand" = "X"], +[ + svn_version=$(cd $srcdir ; $svnversioncommand -n 2>/dev/null) +]) +AS_IF([test ! "X$gitcommand" = "X"], +[ + gitsvn_version=$(cd $srcdir ; git log -1 2>/dev/null | grep "git-svn-id" | sed -e 's/.*@\([[0-9]]\+\) .*/\1/') +]) +AS_IF([test "X$svn_version" = "X" -o "X$svn_version" = "Xexported" -o "X$svn_version" = "XUnversioned directory"], +[ + AS_IF([test "X$gitsvn_version" = "X"], + [ + vcs_name="no" + vcs_version="\"release\"" + ], + [ + vcs_name="yes, git-svn" + vcs_version="\"svn-r$gitsvn_version\"" + ]) +], +[ + vcs_name="yes, svn" + vcs_version="\"svn-r$svn_version\"" +]) +AC_MSG_RESULT($vcs_name) -AC_CONFIG_FILES([ +AC_MSG_CHECKING(VCS version) +AC_MSG_RESULT($vcs_version) +AC_DEFINE_UNQUOTED(VCS_VERSION, [$vcs_version], [VCS revision/hash or tarball version]) + +AC_CONFIG_FILES([ Makefile contrib/Makefile doc/Makefile doc/man/Makefile doc/doxygen/Makefile m4/Makefile -po/Makefile.in +po/Makefile.in src/Makefile src/arm/Makefile src/arm/arm.conf @@ -1292,10 +1426,14 @@ src/ats/ats.conf src/ats-tool/Makefile src/ats-tests/Makefile src/block/Makefile +src/cadet/Makefile +src/cadet/cadet.conf src/core/Makefile src/core/core.conf src/consensus/Makefile src/consensus/consensus.conf +src/conversation/Makefile +src/conversation/conversation.conf src/datacache/Makefile src/datastore/Makefile src/datastore/datastore.conf @@ -1307,28 +1445,24 @@ src/dv/Makefile src/dv/dv.conf src/env/Makefile src/exit/Makefile -src/experimentation/Makefile -src/experimentation/experimentation.conf src/fragmentation/Makefile src/fs/Makefile src/fs/fs.conf src/gns/Makefile src/gns/gns.conf src/gns/nss/Makefile +src/gnsrecord/Makefile src/hello/Makefile src/identity/Makefile src/identity/identity.conf src/include/Makefile -src/include/gnunet_directories.h src/integration-tests/Makefile src/hostlist/Makefile -src/lockmanager/Makefile -src/lockmanager/lockmanager.conf -src/mesh/Makefile -src/mesh/mesh.conf src/multicast/Makefile src/multicast/multicast.conf src/mysql/Makefile +src/namecache/Makefile +src/namecache/namecache.conf src/namestore/Makefile src/namestore/namestore.conf src/nat/Makefile @@ -1337,6 +1471,8 @@ src/nse/nse.conf src/peerinfo/Makefile src/peerinfo/peerinfo.conf src/peerinfo-tool/Makefile +src/peerstore/Makefile +src/peerstore/peerstore.conf src/postgres/Makefile src/psyc/Makefile src/psyc/psyc.conf @@ -1346,11 +1482,21 @@ src/pt/Makefile src/regex/Makefile src/regex/regex.conf src/revocation/Makefile -src/revocation/regex.conf +src/revocation/revocation.conf +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 src/set/set.conf +src/social/Makefile +src/social/social.conf src/statistics/Makefile src/statistics/statistics.conf src/template/Makefile @@ -1366,31 +1512,44 @@ src/util/resolver.conf src/vpn/Makefile src/vpn/vpn.conf pkgconfig/Makefile -pkgconfig/gnunetats.pc pkgconfig/gnunetarm.pc +pkgconfig/gnunetats.pc pkgconfig/gnunetblock.pc +pkgconfig/gnunetcadet.pc +pkgconfig/gnunetconsensus.pc +pkgconfig/gnunetconversation.pc pkgconfig/gnunetcore.pc pkgconfig/gnunetdatacache.pc pkgconfig/gnunetdatastore.pc pkgconfig/gnunetdht.pc pkgconfig/gnunetdns.pc pkgconfig/gnunetdnsparser.pc +pkgconfig/gnunetdnsstub.pc pkgconfig/gnunetdv.pc +pkgconfig/gnunetenv.pc pkgconfig/gnunetfragmentation.pc pkgconfig/gnunetfs.pc pkgconfig/gnunetgns.pc pkgconfig/gnunethello.pc -pkgconfig/gnunetlockmanager.pc -pkgconfig/gnunetmesh.pc +pkgconfig/gnunetidentity.pc +pkgconfig/gnunetmicrophone.pc +pkgconfig/gnunetmulticast.pc pkgconfig/gnunetmysql.pc pkgconfig/gnunetnamestore.pc pkgconfig/gnunetnat.pc pkgconfig/gnunetnse.pc pkgconfig/gnunetpeerinfo.pc pkgconfig/gnunetpostgres.pc +pkgconfig/gnunetpsyc.pc +pkgconfig/gnunetpsycstore.pc pkgconfig/gnunetregex.pc +pkgconfig/gnunetrevocation.pc +pkgconfig/gnunetrps.pc +pkgconfig/gnunetscalarproduct.pc +pkgconfig/gnunetset.pc +pkgconfig/gnunetsocial.pc +pkgconfig/gnunetspeaker.pc pkgconfig/gnunetstatistics.pc -pkgconfig/gnunetstream.pc pkgconfig/gnunettestbed.pc pkgconfig/gnunettesting.pc pkgconfig/gnunettransport.pc @@ -1411,15 +1570,22 @@ fi # sqlite if test "x$sqlite" = "x0" then - AC_MSG_NOTICE([NOTICE: sqlite not found. sqLite support will not be compiled.]) + AC_MSG_ERROR([ERROR: sqlite3 not found, but sqlite3 is required.]) fi -# libcurl -if test "x$curl" = "x0" +# libgnurl +if test "x$gnurl" = "x0" then - AC_MSG_NOTICE([NOTICE: libcurl not found. http client support will not be compiled.]) + if test "x$curl" = "x0" + 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]) + else + AC_MSG_NOTICE([WARNING: libgnurl not found, trying to use libcurl-gnutls instead.]) + fi fi + # bluetooth if test "x$bluetooth" = "x0" then @@ -1429,7 +1595,12 @@ fi #gnutls if test x$gnutls != xtrue then - AC_MSG_NOTICE([NOTICE: gnutls not found, gnunet-gns-proxy will not be built]) + AC_MSG_NOTICE([NOTICE: GnuTLS not found, gnunet-gns-proxy will not be built]) +else +if test "x$gnutls_dane" != "x1" +then + AC_MSG_NOTICE([NOTICE: GnuTLS has no DANE support, DANE validation will not be possible]) +fi fi # java ports @@ -1438,11 +1609,30 @@ then AC_MSG_NOTICE([NOTICE: opening ports for gnunet-java bindings by default.]) fi +# MHD if test "x$lmhd" != "x1" then AC_MSG_NOTICE([NOTICE: libmicrohttpd not found, http transport will not be installed.]) fi +# conversation +if test "x$conversation_backend" == "xnone" +then + if test "x$pulse" != "x1" + then + AC_MSG_NOTICE([NOTICE: libpulse(audio) not found, conversation will not be built.]) + fi + if test "x$opus" != "x1" + then + AC_MSG_NOTICE([NOTICE: libopus not found, conversation will not be built.]) + fi + if test "x$gst" != "x1" + then + AC_MSG_NOTICE([NOTICE: GStreamer not found, conversation will not be built.]) + fi +fi + + AC_MSG_NOTICE([NOTICE: Database support is set to MySQL: $mysql, SQLite: $sqlite, Postgres: $postgres]) if test "$enable_framework_build" = "yes" @@ -1468,16 +1658,16 @@ Make sure that '/var/lib/gnunet' is owned (and writable) by user After that, run (if necessary as 'root') make install -to install everything. +to install everything. Each GNUnet user should be added to the 'gnunet' group (may require fresh login to come into effect): - adduser $USERNAME gnunet + 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 +"USERNAME" with the respective login names). If you have a global IP address, no further configuration is required. - -Optionally, download and compile gnunet-gtk to get a GUI for + +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.