X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=66e55dfa755d2462cda126dd771519b9349c756b;hb=2e0897995fd89619b9da5050372239736bf87d68;hp=9dc1878280e98e22658dc2e0325cd37996b1a867;hpb=5ca7a3c1c00b37500ea0520a6918e4d746cbe242;p=oweals%2Fgnunet.git diff --git a/configure.ac b/configure.ac index 9dc187828..66e55dfa7 100644 --- a/configure.ac +++ b/configure.ac @@ -22,13 +22,13 @@ # AC_PREREQ(2.61) # Checks for programs. -AC_INIT([gnunet], [0.9.0pre2],[bug-gnunet@gnu.org]) +AC_INIT([gnunet], [0.9.0pre3],[bug-gnunet@gnu.org]) AC_CANONICAL_TARGET AC_CANONICAL_HOST AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE([gnunet], [0.9.0pre2]) +AM_INIT_AUTOMAKE([gnunet], [0.9.0pre3]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_CONFIG_HEADERS([gnunet_config.h]) AH_TOP([#define _GNU_SOURCE 1]) @@ -193,6 +193,16 @@ then AC_MSG_ERROR([GNUnet needs libgcrypt]) 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)]), + [AS_IF([test "x$enableval" = "xyes"], [], + [test "x$enableval" = "xno"], [AC_DEFINE([GNUNET_CULL_LOGGING],[],[Define to cull all logging calls])], + [test "x$enableval" = "xverbose"], [extra_logging=GNUNET_YES] + [test "x$enableval" = "xveryverbose"], [extra_logging=\(GNUNET_YES+1\)]) + ], []) +AC_DEFINE_UNQUOTED([GNUNET_EXTRA_LOGGING],[$extra_logging],[1 if extra logging is enabled, 2 for very verbose extra logging, 0 otherwise]) + if test $build = $target then AC_MSG_CHECKING([for working HMAC]) @@ -200,7 +210,8 @@ 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, @@ -215,19 +226,28 @@ AC_RUN_IFELSE( 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); @@ -235,40 +255,49 @@ AC_RUN_IFELSE( ]])], [AC_MSG_RESULT([yes])], [ - if test $? = 3 + RESULT=$? + if test $RESULT = 3 then AC_MSG_FAILURE([HMAC test vector does not match. This is a known problem with libgcrypt 1.2.2 on Windows and fixed in 1.4.6.]) - else + fi + if test $RESULT = 2 + then AC_MSG_FAILURE([HMAC test failed]) fi + if test $RESULT = 1 + then + AC_MSG_FAILURE([libgcrypt header version does not match library version]) + fi ]) AC_LANG_POP(C) +fi # $build = $target # libcurl LIBCURL_CHECK_CONFIG(,7.20.1,,AC_MSG_ERROR([GNUnet requires libcurl >= 7.20.1])) # restore LIBS LIBS=$SAVE_LIBS -fi # $build = $target - -# glpk -#AC_CHECK_HEADERS(glpk.h, glpk=true) -#AM_CONDITIONAL(HAVE_GLPK, test x$glpk = xtrue) -#AC_CHECK_LIB([glpk],[glp_create_prob]) - -glpk=true -AC_CHECK_HEADERS(glpk.h, ,[gplk=false]) -AC_CHECK_LIB([glpk],[glp_create_prob], , [gplk=false]) -# GLPK must support atm MLP presolving, version >= 4.32 -AC_CHECK_MEMBERS(glp_iocp.presolve, ,[gplk=false],[[#include ]]) -if test $gplk == false +AC_ARG_ENABLE([ats], + [AS_HELP_STRING([--enable-ats], [enable ATS code])], + [enable_ats=${enableval}], + [enable_ats=no]) +if test x${enable_ats} = xyes then - AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue]) - AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk != x$gplk]) - AC_MSG_WARN([GNUnet requires GLPK >= 4.32]) + AC_CHECK_HEADERS([glpk.h],[glpk=true],[gplk=false]) + AC_CHECK_LIB([glpk],[glp_create_prob],,[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 + then + AM_CONDITIONAL(HAVE_LIBGLPK, false) + AC_MSG_WARN([GNUnet requires GLPK >= 4.32]) + else + AM_CONDITIONAL(HAVE_LIBGLPK, true) + AC_DEFINE([HAVE_LIBGLPK],[1],[Have GLPK]) + fi else - AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue]) - AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk = x$gplk]) + AM_CONDITIONAL(HAVE_LIBGLPK, false) + AC_MSG_RESULT([no]) fi # test for kvm and kstat (for CPU stats under BSD/Solaris) @@ -388,39 +417,6 @@ AM_CONDITIONAL(HAVE_POSTGRES, test x$postgres = xtrue) AC_SUBST(POSTGRES_CPPFLAGS) AC_SUBST(POSTGRES_LDFLAGS) -# test for pcap -pcap=0 -AC_MSG_CHECKING(for libpcap) -AC_ARG_WITH(pcap, - [ --with-pcap=PFX base of pcap installation], - [AC_MSG_RESULT("$with_pcap") - case $with_pcap in - no) - ;; - yes) - AC_CHECK_HEADERS(pcap.h, - pcap=1) - ;; - *) - LDFLAGS="-L$with_pcap/lib $LDFLAGS" - CPPFLAGS="-I$with_pcap/include $CPPFLAGS" - AC_CHECK_HEADERS(pcap.h, - EXT_LIB_PATH="-L$with_pcap/lib $EXT_LIB_PATH" - PCAP_LDFLAGS="-L$with_pcap/lib" - PCAP_CPPFLAGS="-I$with_pcap/include" - pcap=1) - LDFLAGS=$SAVE_LDFLAGS - CPPFLAGS=$SAVE_CPPFLAGS - ;; - esac - ], - [AC_MSG_RESULT([--with-pcap not specified]) - AC_CHECK_HEADERS(pcap.h, pcap=1)]) -AM_CONDITIONAL(HAVE_PCAP, test x$pcap = x1) -AC_SUBST(PCAP_CPPFLAGS) -AC_SUBST(PCAP_LDFLAGS) - - # test for libz (maybe required for linking mysql) zlib=1 AC_CHECK_LIB(z, compress,,zlib=0) @@ -554,42 +550,6 @@ AM_CONDITIONAL(HAVE_MHD, test x$lmhd = x1) AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd]) -# openssl -openssl=0 -AC_MSG_CHECKING([for openssl]) -AC_ARG_WITH(openssl, - [ --with-openssl=PFX base of openssl installation], - [AC_MSG_RESULT([$with_openssl]) - case $with_openssl in - no) - ;; - yes) - AC_CHECK_HEADERS([openssl/ssl.h], - AC_CHECK_LIB([ssl], [SSL_new], - openssl=1)) - ;; - *) - LDFLAGS="-L$with_openssl/lib $LDFLAGS" - CPPFLAGS="-I$with_openssl/include $CPPFLAGS" - AC_CHECK_HEADERS([openssl/ssl.h], - AC_CHECK_LIB([ssl], [SSL_new], - EXT_LIB_PATH="-L$with_openssl/lib $EXT_LIB_PATH" - openssl=1)) - ;; - esac - ], - [AC_MSG_RESULT([--with-openssl not specified]) - AC_CHECK_HEADERS([openssl/ssl.h], - AC_CHECK_LIB([ssl], [SSL_new], - openssl=1))]) -AM_CONDITIONAL(HAVE_OPENSSL, test x$openssl = x1) -AC_DEFINE_UNQUOTED([HAVE_OPENSSL], $openssl, [We have openssl]) - - - - - - # restore LIBS LIBS=$SAVE_LIBS @@ -613,40 +573,6 @@ else AM_CONDITIONAL(HAVE_PYTHON_PEXPECT, 0) fi -# libesmtp -esmtp=0 -AC_MSG_CHECKING([for libesmtp]) -AC_ARG_WITH(esmtp, - [ --with-esmtp=PFX base of libesmtp installation], - [AC_MSG_RESULT([$with_esmtp]) - case $with_esmtp in - no) - ;; - yes) - AC_CHECK_HEADERS(libesmtp.h, - AC_CHECK_LIB([esmtp], [smtp_start_session], - esmtp=1)) - ;; - *) - LDFLAGS="-L$with_esmtp/lib $LDFLAGS" - CPPFLAGS="-I$with_esmtp/include $CPPFLAGS" - AC_CHECK_HEADERS(libesmtp.h, - AC_CHECK_LIB([esmtp], [smtp_start_session], - EXT_LIB_PATH="-L$with_esmtp/lib $EXT_LIB_PATH" - esmtp=1)) - ;; - esac - ], - [AC_MSG_RESULT([--with-esmtp not specified]) - AC_CHECK_HEADERS(libesmtp.h, - AC_CHECK_LIB([esmtp], [smtp_start_session], - esmtp=1))]) -AM_CONDITIONAL(HAVE_ESMTP, test x$esmtp = x1) -AC_DEFINE_UNQUOTED([HAVE_ESMTP], $esmtp, [We have libesmtp]) -# restore LIBS -LIBS=$SAVE_LIBS - - # check for gettext AM_GNU_GETTEXT([external]) @@ -752,68 +678,82 @@ AC_SUBST(EXT_LIB_PATH) # should 'make check' run tests? AC_MSG_CHECKING(whether to run tests) -AC_ARG_ENABLE(testruns, - [AS_HELP_STRING([--enable-testruns=yes/no], - [disable running tests on make check (default is YES)])], - [enable_tests_run=$enableval], - [enable_tests_run="yes"]) +AC_ARG_ENABLE([testruns], + [AS_HELP_STRING([--disable-testruns], [disable running tests on make check (default is YES)])], + [enable_tests_run=${enableval}], + [enable_tests_run=yes]) AC_MSG_RESULT($enable_test_run) -AM_CONDITIONAL([DISABLE_TEST_RUN], [test "x$enable_tests_run" = "xno"]) +AM_CONDITIONAL([ENABLE_TEST_RUN], [test "x$enable_tests_run" = "xyes"]) + +# should expensive tests be run? +AC_MSG_CHECKING(whether to run expensive tests) +AC_ARG_ENABLE([expensivetests], + [AS_HELP_STRING([--enable-expensive-tests], [enable running expensive testcases])], + [enable_expensive=${enableval}], + [enable_expensive=no]) +AC_MSG_RESULT($enable_expensive) +AM_CONDITIONAL([HAVE_EXPENSIVE_TESTS], [test "x$enable_expensive" = "xyes"]) + +# should benchmarks be run? +AC_MSG_CHECKING(whether to run benchmarks during make check) +AC_ARG_ENABLE([benchmarks], + [AS_HELP_STRING([--enable-benchmarks], [enable running benchmarks during make check])], + [enable_benchmarks=${enableval}], + [enable_benchmarks=no]) +AC_MSG_RESULT($enable_benchmarks) +AM_CONDITIONAL([HAVE_BENCHMARKS], [test "x$enable_benchmarks" = "xyes"]) # should experimental code be compiled (code that may not yet compile)? -disable_experimental=yes AC_MSG_CHECKING(whether to compile experimental code) -AC_ARG_ENABLE(experimental, - [AS_HELP_STRING([--enable-experimental], - [enable compiling experimental code])], - [enable_experimental=$enableval], - [enable_experimental="no"]) +AC_ARG_ENABLE([experimental], + [AS_HELP_STRING([--enable-experimental], [enable compiling experimental code])], + [enable_experimental=${enableval}], + [enable_experimental=no]) AC_MSG_RESULT($enable_experimental) AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"]) -# should malicious code be compiled (code used for testing with malicious peers) -enable_malicious=0 -AC_MSG_CHECKING(whether to compile malicious code) -AC_ARG_ENABLE(malicious, - [AS_HELP_STRING([--enable-malicious], - [enable compiling malicious code (only for developers for testing)])], - [enable_malicious=1], - [enable_malicious=0]) -AC_MSG_RESULT($enable_malicious) -AM_CONDITIONAL([HAVE_MALICIOUS], [test "x$enable_malicious" = "x1"]) -AC_DEFINE_UNQUOTED([HAVE_MALICIOUS], $enable_malicious, [Compile malicious code]) - # should code be enabled that works around missing OS functionality on Windows? # used for test cases -AC_ARG_ENABLE(windows_workarounds, [AS_HELP_STRING([--enable-windows_workarounds], - [enable workarounds used on Windows (only useful for test cases)])]) if test $build_target = "mingw" then workarounds=1 else - if test x$enable_windows_workarounds = "xyes" - then - workarounds=1 - else - workarounds=0 - fi + AC_MSG_CHECKING(whether to 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]) + AC_MSG_RESULT($enable_workarounds) + if test x$enable_windows_workarounds = "xyes" + then + workarounds=1 + else + workarounds=0 + fi fi AC_DEFINE_UNQUOTED([ENABLE_WINDOWS_WORKAROUNDS], $workarounds, [enable workarounds used on Windows (only useful for test cases)]) # gcov compilation -use_gcov=no -AC_ARG_ENABLE([coverage], AS_HELP_STRING([--enable-coverage], - [Compile the library with code coverage support (default is NO)]), - [use_gcov=yes], [use_gcov=no]) +AC_MSG_CHECKING(whether to compile with support for code coverage analysis) +AC_ARG_ENABLE([coverage], + AS_HELP_STRING([--enable-coverage], + [compile the library with code coverage support]), + [use_gcov=${enableval}], + [use_gcov=no]) +AC_MSG_RESULT($use_gcov) AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"]) + AC_CONFIG_FILES([ Makefile contrib/Makefile +doc/Makefile +doc/man/Makefile m4/Makefile po/Makefile.in src/Makefile src/arm/Makefile +src/ats/Makefile src/block/Makefile src/core/Makefile src/datacache/Makefile @@ -827,8 +767,8 @@ src/include/Makefile src/include/gnunet_directories.h src/hostlist/Makefile src/mesh/Makefile -src/monkey/Makefile src/nat/Makefile +src/nse/Makefile src/peerinfo/Makefile src/peerinfo-tool/Makefile src/statistics/Makefile @@ -851,6 +791,8 @@ pkgconfig/gnunetdv.pc pkgconfig/gnunetfragmentation.pc pkgconfig/gnunetfs.pc pkgconfig/gnunethello.pc +pkgconfig/gnunetnat.pc +pkgconfig/gnunetnse.pc pkgconfig/gnunetpeerinfo.pc pkgconfig/gnunetstatistics.pc pkgconfig/gnunettesting.pc @@ -878,21 +820,6 @@ then AC_MSG_NOTICE([NOTICE: libmicrohttpd not found, http transport will not be installed.]) fi -if test "x$esmtp" != "x1" -then - AC_MSG_NOTICE([NOTICE: libesmtp not found, monkey will not be installed.]) -fi - -if test "x$pcap" != "x1" -then - AC_MSG_NOTICE([NOTICE: libpcap not found, WiFi support will not be installed.]) -fi - -if test "x$openssl" != "x1" -then - AC_MSG_NOTICE([NOTICE: OpenSSL not found, monkey will not be installed.]) -fi - AC_MSG_NOTICE([NOTICE: Database support is set to MySQL: $mysql, SQLite: $sqlite, Postgres: $postgres]) if test "$enable_framework_build" = "yes" @@ -924,5 +851,6 @@ configuration file: mkdir $HOME/.gnunet/ touch $HOME/.gnunet/gnunet.conf -Optionally, download and compile gnunet-gtk to get a GUI. +Optionally, download and compile: +- gnunet-gtk to get a GUI for file-sharing and configuration. ********************************************])