X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=2d9fe0b06709b4647801801225733d7e353cd45a;hb=dee73e0b5c185a16f2894ccdb3ddb20b0569c0a2;hp=d5c4e6c66496b3dadc8b306859b2d833e3d5d8d2;hpb=ad8ed315dca32a5de2af97bfda96c6199c565722;p=oweals%2Fgnunet.git diff --git a/configure.ac b/configure.ac index d5c4e6c66..2d9fe0b06 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--2015 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 @@ -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. @@ -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 @@ -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; @@ -75,7 +70,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 +133,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 +145,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 +197,31 @@ AC_CHECK_LIB(socket, socket) AC_CHECK_LIB(m, log) 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) + + +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 +231,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 @@ -243,7 +251,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" @@ -354,87 +362,155 @@ 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 "$bluetooth" = 1 -then - AM_CONDITIONAL(HAVE_LIBBLUETOOTH, true) - AC_DEFINE([HAVE_LIBBLUETOOTH],[1],[Have bluetooth library]) -else - AM_CONDITIONAL(HAVE_LIBBLUETOOTH, false) -fi if test "$build_target" = "mingw" then bluetooth=1 fi +AM_CONDITIONAL(HAVE_LIBBLUETOOTH, [test "$bluetooth" = 1]) +if test "$bluetooth" = 1 +then + AC_DEFINE([HAVE_LIBBLUETOOTH],[1],[Have bluetooth library]) +else + AC_DEFINE([HAVE_LIBBLUETOOTH],[0],[Lacking bluetooth 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 - AM_CONDITIONAL(HAVE_PULSE, true) - AC_DEFINE([HAVE_PULSE],[1],[Have libpulse(audio) library]) -else - AM_CONDITIONAL(HAVE_PULSE, false) -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 AC_CHECK_LIB(opus,opus_decode_float, - [AC_CHECK_HEADER([opus/opus.h],opus=1)]) + [AC_CHECK_HEADER([opus/opus.h], + [AC_CHECK_DECL([OPUS_SET_GAIN],[opus=1],[],[[#include ]] + )] + )] +) if test "$opus" = 1 then - AM_CONDITIONAL(HAVE_OPUS, true) AC_DEFINE([HAVE_OPUS],[1],[Have libopus library]) -else - AM_CONDITIONAL(HAVE_OPUS, false) 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.33.0,gnurl=1,gnurl=0) +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) + 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 -# 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 - 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])) + AC_CHECK_HEADERS([curl/curl.h], + 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 -AC_MSG_RESULT($libidn) -# restore LIBS -LIBS=$SAVE_LIBS +# 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 or gnurl >= 7.34]) +fi +else + AM_CONDITIONAL(HAVE_LIBCURL, true) + AC_DEFINE([HAVE_LIBCURL],[1],[Have CURL]) +fi + + +# 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 AC_CHECK_LIB([glpk],[glp_init_env],,[gplk=false]) @@ -466,6 +542,17 @@ fi AC_CHECK_LIB([kvm],[kvm_open]) AC_CHECK_LIB([kstat],[kstat_open]) + +# 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) +AM_CONDITIONAL([TALER_ONLY], [test "x$taler_only" = "xyes"]) + # test for libextractor extractor=0 AC_MSG_CHECKING(for libextractor) @@ -494,12 +581,21 @@ 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 @@ -538,6 +634,75 @@ 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 @@ -561,7 +726,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 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],,, +[#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 @@ -600,65 +778,15 @@ 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 + CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS" + AC_CHECK_HEADERS([libpq-fe.h], + postgres=true) +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 @@ -721,13 +849,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" @@ -762,15 +891,19 @@ 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_RUN_IFELSE([AC_LANG_SOURCE([ + AC_CHECK_LIB([microhttpd], [MHD_get_fdset2], + [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 >= 0x0093002 ? 0 : 1; } - ])], [ - AC_MSG_RESULT(ok) - lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]), + #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"]) @@ -780,16 +913,20 @@ 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_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 >= 0x0093002 ? 0 : 1; } - ])], [ - AC_MSG_RESULT(ok) - lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]), + #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"]) @@ -799,15 +936,18 @@ 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_RUN_IFELSE([AC_LANG_SOURCE([ + AC_CHECK_LIB([microhttpd], [MHD_get_fdset2], + [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 >= 0x0093002 ? 0 : 1; } - ])], [ - AC_MSG_RESULT(ok) - lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]), + #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"])]) @@ -824,10 +964,7 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :]) # check for gettext AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION([0.16.1]) - -# check for iconv -AM_ICONV +AM_GNU_GETTEXT_VERSION([0.18.1]) # Checks for standard typedefs, structures, and compiler characteristics. AC_TYPE_PID_T @@ -870,28 +1007,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) @@ -1005,6 +1120,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], @@ -1016,6 +1132,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" @@ -1024,21 +1143,23 @@ 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]) - -gnutls_dane=0 -AC_CHECK_HEADERS([gnutls/dane.h], - AC_CHECK_LIB([gnutls-dane], [dane_verify_crt_raw], - gnutls_dane=true)) -AM_CONDITIONAL(HAVE_GNUTLS_DANE, test x$gnutls_dane = xtrue) +AM_CONDITIONAL(HAVE_GNUTLS_DANE, test x$gnutls_dane = x1) AC_DEFINE_UNQUOTED([HAVE_GNUTLS_DANE], $gnutls_dane, [We have GnuTLS with DANE support]) @@ -1158,6 +1279,60 @@ AC_ARG_ENABLE([experimental], AC_MSG_RESULT($enable_experimental) AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"]) +# FTBFS right now... +AC_MSG_CHECKING(whether to compile ATS test code) +AC_ARG_ENABLE([wachs], + [AS_HELP_STRING([--enable-wachs], [enable compiling ATS test code])], + [enable_wachs=${enableval}], + [enable_wachs=no]) +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], + [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], [test 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], @@ -1292,23 +1467,38 @@ 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_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 @@ -1326,6 +1516,8 @@ 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 @@ -1343,8 +1535,6 @@ 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 @@ -1356,11 +1546,8 @@ 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/mesh/Makefile -src/mesh/mesh.conf src/multicast/Makefile src/multicast/multicast.conf src/mysql/Makefile @@ -1374,6 +1561,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 @@ -1384,12 +1573,20 @@ src/regex/Makefile src/regex/regex.conf src/revocation/Makefile 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 @@ -1404,10 +1601,13 @@ src/util/Makefile src/util/resolver.conf src/vpn/Makefile src/vpn/vpn.conf +src/rest/Makefile +src/identity-token/Makefile pkgconfig/Makefile pkgconfig/gnunetarm.pc pkgconfig/gnunetats.pc pkgconfig/gnunetblock.pc +pkgconfig/gnunetcadet.pc pkgconfig/gnunetconsensus.pc pkgconfig/gnunetconversation.pc pkgconfig/gnunetcore.pc @@ -1424,7 +1624,6 @@ pkgconfig/gnunetfs.pc pkgconfig/gnunetgns.pc pkgconfig/gnunethello.pc pkgconfig/gnunetidentity.pc -pkgconfig/gnunetmesh.pc pkgconfig/gnunetmicrophone.pc pkgconfig/gnunetmulticast.pc pkgconfig/gnunetmysql.pc @@ -1437,8 +1636,10 @@ 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/gnunettestbed.pc @@ -1461,15 +1662,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 # libgnurl -if test "x$gnurl" = "x0" +if test "$gnurl" = "0" then - AC_MSG_NOTICE([NOTICE: libgnurl not found. http client support will not be compiled.]) + 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]) + else + AC_MSG_NOTICE([WARNING: libgnurl not found, trying to use libcurl-gnutls instead.]) + fi fi + # bluetooth if test "x$bluetooth" = "x0" then @@ -1481,7 +1689,7 @@ if test x$gnutls != xtrue then AC_MSG_NOTICE([NOTICE: GnuTLS not found, gnunet-gns-proxy will not be built]) else -if test x$gnutls_dane != xtrue +if test "x$gnutls_dane" != "x1" then AC_MSG_NOTICE([NOTICE: GnuTLS has no DANE support, DANE validation will not be possible]) fi @@ -1499,16 +1707,26 @@ then AC_MSG_NOTICE([NOTICE: libmicrohttpd not found, http transport will not be installed.]) fi -# Pulse Audio -if test "x$pulse" != "x1" +# conversation +if test "x$conversation_backend" = "xnone" then - AC_MSG_NOTICE([NOTICE: libpulse(audio) not found, conversation will not be built.]) + 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 -# Opus -if test "x$opus" != "x1" +if test "$extractor" != 1 then - AC_MSG_NOTICE([NOTICE: libopus not found, conversation will not be built.]) + 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]) @@ -1526,9 +1744,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 @@ -1540,11 +1758,13 @@ 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. +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