X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=93795211755457da7c97d86ad37e8e8d5117350e;hb=173a142f9b7acd4a788f41dd23ca349cd4b901e9;hp=92130c6e42b5f1c07416d01c0ba2cc81654a7ff2;hpb=6be112bbd13b5e6708decbf92f953326ecac8a25;p=oweals%2Fgnunet.git diff --git a/configure.ac b/configure.ac index 92130c6e4..937952117 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ # # 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.0], [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,6 +202,15 @@ 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! @@ -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 @@ -379,10 +387,7 @@ 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 @@ -392,18 +397,63 @@ 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) @@ -423,11 +473,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) @@ -561,7 +614,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 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 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 sys/ucred.h endian.h sys/endian.h execinfo.h]) SAVE_LDFLAGS=$LDFLAGS SAVE_CPPFLAGS=$CPPFLAGS @@ -870,28 +923,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 +1036,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 +1048,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 +1059,24 @@ 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 +1196,25 @@ AC_ARG_ENABLE([experimental], AC_MSG_RESULT($enable_experimental) AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"]) +# 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 +1349,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 @@ -1356,7 +1428,6 @@ 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 @@ -1384,6 +1455,8 @@ src/regex/Makefile src/regex/regex.conf src/revocation/Makefile src/revocation/revocation.conf +src/secretsharing/Makefile +src/secretsharing/secretsharing.conf src/scalarproduct/Makefile src/scalarproduct/scalarproduct.conf src/set/Makefile @@ -1466,6 +1539,7 @@ fi if test "x$gnurl" = "x0" then AC_MSG_NOTICE([NOTICE: libgnurl not found. http client support will not be compiled.]) + AC_MSG_WARN([libgnurl not found. hostlist daemon will not be compiled, and you probably WANT hostlist daemon]) fi # bluetooth @@ -1479,7 +1553,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 @@ -1497,17 +1571,23 @@ 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" -then - AC_MSG_NOTICE([NOTICE: libopus not found, conversation will not be built.]) -fi AC_MSG_NOTICE([NOTICE: Database support is set to MySQL: $mysql, SQLite: $sqlite, Postgres: $postgres]) @@ -1538,9 +1618,9 @@ 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