X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=50169797ef677e6d0bd5690ed0aec2d170da9a5b;hb=0a4d547dc9cfc6dbbe7abd1611d56b7ca32370e2;hp=9400835d014c733bf5bd59ccf77fad590f121976;hpb=0221a112acdf950799c19796961220466aadb396;p=oweals%2Fgnunet.git diff --git a/configure.ac b/configure.ac index 9400835d0..50169797e 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 @@ -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 @@ -223,7 +223,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 +232,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 @@ -296,10 +296,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 +310,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])], @@ -402,14 +402,14 @@ else fi -# libcurl -LIBCURL_CHECK_CONFIG(,7.21.3,curl=1,curl=0) -if test "$curl" = 1 +# libgnurl +LIBGNURL_CHECK_CONFIG(,7.33.0,gnurl=1,gnurl=0) +if test "$gnurl" = 1 then - AM_CONDITIONAL(HAVE_LIBCURL, true) - AC_DEFINE([HAVE_LIBCURL],[1],[Have libcurl]) + AM_CONDITIONAL(HAVE_LIBGNURL, true) + AC_DEFINE([HAVE_LIBGNURL],[1],[Have libgnurl]) else - AM_CONDITIONAL(HAVE_LIBCURL, false) + AM_CONDITIONAL(HAVE_LIBGNURL, false) fi @@ -425,7 +425,7 @@ if test "$libidn" != "no"; then fi AC_CHECK_HEADER(idna.h, AC_CHECK_LIB(idn, stringprep_check_version, - [libidn=yes LIBS="${LIBS} -lidn"], + [libidn=yes LIBS="${LIBS} -lidn"], AC_MSG_FAILURE([GNUnet requires libidn])), AC_MSG_FAILURE([GNUnet requires libidn])) fi @@ -437,7 +437,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 @@ -901,7 +901,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" @@ -1032,26 +1032,32 @@ AC_ARG_WITH(gnutls, AC_CHECK_LIB([gnutls], [gnutls_priority_set], gnutls=true))]) 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]) + +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) +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 @@ -1258,7 +1264,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]) @@ -1274,10 +1280,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"]) @@ -1286,32 +1292,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 @@ -1345,6 +1366,7 @@ 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 @@ -1357,6 +1379,8 @@ 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 @@ -1375,6 +1399,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 @@ -1414,6 +1440,7 @@ pkgconfig/gnunetgns.pc pkgconfig/gnunethello.pc pkgconfig/gnunetidentity.pc pkgconfig/gnunetmesh.pc +pkgconfig/gnunetmicrophone.pc pkgconfig/gnunetmulticast.pc pkgconfig/gnunetmysql.pc pkgconfig/gnunetnamestore.pc @@ -1427,6 +1454,7 @@ pkgconfig/gnunetregex.pc pkgconfig/gnunetrevocation.pc pkgconfig/gnunetscalarproduct.pc pkgconfig/gnunetset.pc +pkgconfig/gnunetspeaker.pc pkgconfig/gnunetstatistics.pc pkgconfig/gnunettestbed.pc pkgconfig/gnunettesting.pc @@ -1451,10 +1479,10 @@ then AC_MSG_NOTICE([NOTICE: sqlite not found. sqLite support will not be compiled.]) 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.]) + AC_MSG_NOTICE([NOTICE: libgnurl not found. http client support will not be compiled.]) fi # bluetooth @@ -1466,7 +1494,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 != xtrue +then + AC_MSG_NOTICE([NOTICE: GnuTLS has no DANE support, DANE validation will not be possible]) +fi fi # java ports @@ -1518,7 +1551,7 @@ 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): @@ -1526,8 +1559,8 @@ require fresh login to come into effect): (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 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.