# This file is part of GNUnet.
-# (C) 2001--2010 Christian Grothoff (and other contributing authors)
+# (C) 2001--2011 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
#
AC_PREREQ(2.61)
# Checks for programs.
-AC_INIT([gnunet], [0.9.0pre3],[bug-gnunet@gnu.org])
+AC_INIT([gnunet], [0.9.1],[bug-gnunet@gnu.org])
AC_CANONICAL_TARGET
AC_CANONICAL_HOST
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE([gnunet], [0.9.0pre3])
+AM_INIT_AUTOMAKE([gnunet], [0.9.1])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_CONFIG_HEADERS([gnunet_config.h])
AH_TOP([#define _GNU_SOURCE 1])
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 -no-undefined -Wl,--export-all-symbols"
- LIBS="$LIBS -lws2_32 -lplibc"
+ LDFLAGS="$LDFLAGS -Wl,-no-undefined -Wl,--export-all-symbols"
+ LIBS="$LIBS -lws2_32 -lplibc -lgnurx -lole32"
CFLAGS="-mms-bitfields $CFLAGS"
CPPFLAGS="-D_WIN32_WINNT=0x0501 $CPPFLAGS"
build_target="mingw"
# 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"
+then
+ AC_MSG_ERROR([on W32 GNUnet needs libgnurx])
+fi
+
# libgcrypt
gcrypt=0
AM_PATH_LIBGCRYPT(1.2.0, gcrypt=1)
AC_MSG_ERROR([GNUnet needs libgcrypt])
fi
+# Adam shostack suggests the following for Windows:
+# -D_FORTIFY_SOURCE=2 -fstack-protector-all
+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 -fwrapv -fPIE -Wstack-protector"
+ CFLAGS="$CFLAGS --param ssp-buffer-size=1"
+ LDFLAGS="$LDFLAGS -pie"
+fi])
+
+
+# Linker hardening options
+# Currently these options are ELF specific - you can't use this with MacOSX
+AC_ARG_ENABLE(linker-hardening,
+ AS_HELP_STRING(--enable-linker-hardening, enable linker security fixups),
+[if test x$enableval = xyes; then
+ LDFLAGS="$LDFLAGS -z relro -z now"
+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])
LIBS="$LIBS $LIBGCRYPT_LIBS"
CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS"
AC_RUN_IFELSE(
- [AC_LANG_PROGRAM([#include <gcrypt.h>], [[
+ [AC_LANG_PROGRAM([#include <gcrypt.h>
+ #include <stdio.h>], [[
gcry_md_hd_t mac;
unsigned char data[] = { 0xbf, 0x16, 0x6e, 0x46, 0x3a, 0x6c, 0xf3, 0x93, 0xa7, 0x72,
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);
]])],
[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
# restore LIBS
LIBS=$SAVE_LIBS
-USE_ATS=false
-
-if test x$USE_ATS = xtrue
+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
- glpk=true
- AC_MSG_WARN([ATS enabled])
- AC_CHECK_HEADERS(glpk.h, ,[gplk=false])
- AC_CHECK_LIB([glpk],[glp_create_prob], , [gplk=false])
+ 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 <glpk.h>]])
+ AC_CHECK_MEMBERS(glp_iocp.presolve,,[gplk=false],[[#include <glpk.h>]])
if test x$gplk = xfalse
then
- AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue])
- AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk != x$gplk])
+ AM_CONDITIONAL(HAVE_LIBGLPK, false)
AC_MSG_WARN([GNUnet requires GLPK >= 4.32])
else
- AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue])
- AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk = x$gplk])
+ AM_CONDITIONAL(HAVE_LIBGLPK, true)
+ AC_DEFINE([HAVE_LIBGLPK],[1],[Have GLPK])
fi
else
- AC_MSG_WARN([ATS disabled])
- AM_CONDITIONAL(HAVE_GLPK, false)
AM_CONDITIONAL(HAVE_LIBGLPK, false)
+ AC_MSG_RESULT([no])
fi
# test for kvm and kstat (for CPU stats under BSD/Solaris)
# restore LIBS
LIBS=$SAVE_LIBS
+# test for libunistring
+gl_LIBUNISTRING
+if test $HAVE_LIBUNISTRING != yes; then
+ AC_MSG_ERROR([GNUnet requires libunistring])
+fi
+if test $gl_libunistring_hexversion -le 2305; then
+ AC_MSG_ERROR([GNUnet requires libunistring >= 0.9.1.1])
+fi
+# restore LIBS
+LIBS=$SAVE_LIBS
+
+
# Checks for standard header files.
AC_HEADER_DIRENT
LIBS=$SAVE_LIBS
# check for python & pexpect (used for some testcases only)
-AM_PATH_PYTHON([2.5],, [:])
+AM_PATH_PYTHON([2.6],, [:])
AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
if test "$PYTHON" != :
# Checks for library functions.
AC_FUNC_CLOSEDIR_VOID
AC_FUNC_FORK
-AC_FUNC_VFORK
AC_PROG_GCC_TRADITIONAL
AC_FUNC_MEMCMP
AC_FUNC_SELECT_ARGTYPES
AC_HEADER_SYS_WAIT
AC_TYPE_OFF_T
AC_TYPE_UID_T
-AC_CHECK_FUNCS([floor gethostname memmove rmdir strncasecmp strrchr strtol atoll dup2 fdatasync ftruncate gettimeofday memset mkdir mkfifo select socket strcasecmp strchr strdup strerror strstr clock_gettime getrusage rand uname setlocale getcwd mktime gmtime_r gmtime strlcpy strlcat ftruncate stat64 sbrk mmap mremap setrlimit sysconf gethostbyaddr initgroups getifaddrs freeifaddrs getnameinfo getaddrinfo inet_ntoa localtime_r nl_langinfo putenv realpath strndup gethostbyname2 gethostbyname getpeerucred getpeereid])
+AC_CHECK_FUNCS([floor gethostname memmove rmdir strncasecmp strrchr strtol atoll dup2 fdatasync ftruncate gettimeofday memset mkdir mkfifo select socket strcasecmp strchr strdup strerror strstr clock_gettime getrusage rand uname setlocale getcwd mktime gmtime_r gmtime strlcpy strlcat ftruncate stat64 sbrk mmap mremap setrlimit sysconf gethostbyaddr initgroups getifaddrs freeifaddrs getnameinfo getaddrinfo inet_ntoa localtime_r nl_langinfo putenv realpath strndup gethostbyname2 gethostbyname getpeerucred getpeereid setresuid])
# restore LIBS
LIBS=$SAVE_LIBS
AC_SUBST(EXT_LIB_PATH)
+# test for sudo
+AC_MSG_CHECKING(for sudo)
+AC_ARG_WITH(sudo,
+ [ --with-sudo=PATH path to sudo binary (or just yes)],
+ [AC_MSG_RESULT("$with_sudo")
+ case $with_sudo in
+ no)
+ SUDO_BINARY=
+ ;;
+ yes)
+ SUDO_BINARY=sudo
+ ;;
+ *)
+ SUDO_BINARY=$with_sudo
+ ;;
+ esac
+ ],
+ [AC_MSG_RESULT([no])])
+AC_SUBST(SUDO_BINARY)
+
+
# should 'make check' run tests?
AC_MSG_CHECKING(whether to run tests)
AC_ARG_ENABLE([testruns],
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)
-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=${enableval}],
- [enable_malicious=no])
-AC_MSG_RESULT($enable_malicious)
-AM_CONDITIONAL([HAVE_MALICIOUS], [test "x$enable_malicious" = "xyes"])
-if test "$enable_malicious" = "yes"
-then
- AC_DEFINE([HAVE_MALICIOUS],[1],[include malicious code])
-else
- AC_DEFINE([HAVE_MALICIOUS],[0],[disable malicious code])
-fi
-
# should code be enabled that works around missing OS functionality on Windows?
# used for test cases
if test $build_target = "mingw"
po/Makefile.in
src/Makefile
src/arm/Makefile
+src/ats/Makefile
src/block/Makefile
src/core/Makefile
src/datacache/Makefile
src/datastore/Makefile
src/dht/Makefile
+src/dns/Makefile
src/dv/Makefile
src/fragmentation/Makefile
src/fs/Makefile
src/hostlist/Makefile
src/mesh/Makefile
src/nat/Makefile
+src/nse/Makefile
src/peerinfo/Makefile
src/peerinfo-tool/Makefile
src/statistics/Makefile
src/util/Makefile
src/vpn/Makefile
src/chat/Makefile
+src/integration-tests/Makefile
pkgconfig/Makefile
pkgconfig/gnunetarm.pc
pkgconfig/gnunetblock.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
touch $HOME/.gnunet/gnunet.conf
Optionally, download and compile:
-- gnunet-gtk to get a GUI for file-sharing.
-- gnunet-setup to get a GUI for configuration.
+- gnunet-gtk to get a GUI for file-sharing and configuration.
********************************************])
projects / oweals / gnunet.git / blobdiff