#
AC_PREREQ(2.61)
# Checks for programs.
-AC_INIT([gnunet], [0.9.0pre4],[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.0pre4])
+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])
DEFAULT_INTERFACE="\"en0\""
LIBPREFIX=
DLLDIR=lib
+ UNIXONLY="#"
;;
linux*)
AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux system])
build_target="linux"
LIBPREFIX=
DLLDIR=lib
+ UNIXONLY="#"
AC_PATH_XTRA
;;
freebsd*)
build_target="freebsd"
LIBPREFIX=
DLLDIR=lib
+ UNIXONLY="#"
;;
openbsd*)
AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
build_target="openbsd"
LIBPREFIX=
DLLDIR=lib
+ UNIXONLY="#"
;;
netbsd*)
AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
AC_DEFINE_UNQUOTED(NETBSD,1,[This is a NetBSD system])
LIBPREFIX=
DLLDIR=lib
+ UNIXONLY="#"
;;
*solaris*)
AC_DEFINE_UNQUOTED(SOLARIS,1,[This is a Solaris system])
build_target="solaris"
LIBPREFIX=
DLLDIR=lib
+ UNIXONLY="#"
;;
*arm-linux*)
AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux system])
build_target="linux"
LIBPREFIX=
DLLDIR=lib
+ UNIXONLY="#"
;;
*cygwin*)
AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system])
LIBPREFIX=lib
DLLDIR=bin
AC_PROG_CXX
+ UNIXONLY=""
;;
*mingw*)
AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system])
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"
AC_PROG_CXX
LIBPREFIX=lib
DLLDIR=bin
+ UNIXONLY=""
;;
*)
AC_MSG_RESULT(Unrecognised OS $host_os)
AC_DEFINE_UNQUOTED(OTHEROS,1,[Some strange OS])
+ UNIXONLY=""
;;
esac
AC_DEFINE_UNQUOTED([GNUNET_DEFAULT_INTERFACE], $DEFAULT_INTERFACE, [This should be the default choice for the name of the first network interface])
AC_SUBST(DEFAULT_INTERFACE)
+# Disable TCP-based IPC on systems that support UNIX domain
+# sockets in default configuratin:
+AC_SUBST(UNIXONLY)
+
AC_MSG_CHECKING([for build target])
AM_CONDITIONAL(DARWIN, test "$build_target" = "darwin")
AM_CONDITIONAL(CYGWIN, test "$build_target" = "cygwin")
# 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)]),
# 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(SUDO_BINARY)
+# test for gnunetdns group name
+GNUNETDNS_GROUP=gnunetdns
+AC_MSG_CHECKING(for gnunetdns group name)
+AC_ARG_WITH(gnunetdns,
+ [ --with-gnunetdns=GRPNAME name for gnunetdns group],
+ [AC_MSG_RESULT("$with_gnunetdns")
+ case $with_gnunetdns in
+ no)
+ GNUNETDNS_GROUP=gnunet
+ ;;
+ yes)
+ GNUNETDNS_GROUP=gnunetdns
+ ;;
+ *)
+ GNUNETDNS_GROUP=$with_gnunetdns
+ ;;
+ esac
+ ],
+ [AC_MSG_RESULT([gnunetdns])])
+AC_SUBST(GNUNETDNS_GROUP)
+
+
# should 'make check' run tests?
AC_MSG_CHECKING(whether to run tests)
AC_ARG_ENABLE([testruns],
po/Makefile.in
src/Makefile
src/arm/Makefile
+src/arm/arm.conf
src/ats/Makefile
+src/ats/ats.conf
src/block/Makefile
+src/chat/Makefile
+src/chat/chat.conf
src/core/Makefile
+src/core/core.conf
src/datacache/Makefile
src/datastore/Makefile
+src/datastore/datastore.conf
src/dht/Makefile
+src/dht/dht.conf
+src/dns/Makefile
+src/dns/dns.conf
src/dv/Makefile
+src/dv/dv.conf
+src/exit/Makefile
src/fragmentation/Makefile
src/fs/Makefile
+src/fs/fs.conf
src/hello/Makefile
src/include/Makefile
src/include/gnunet_directories.h
src/hostlist/Makefile
src/mesh/Makefile
+src/mesh/mesh.conf
src/nat/Makefile
src/nse/Makefile
+src/nse/nse.conf
src/peerinfo/Makefile
+src/peerinfo/peerinfo.conf
src/peerinfo-tool/Makefile
+src/pt/Makefile
src/statistics/Makefile
+src/statistics/statistics.conf
+src/stream/Makefile
src/template/Makefile
src/testing/Makefile
src/topology/Makefile
src/transport/Makefile
+src/transport/transport.conf
+src/tun/Makefile
src/util/Makefile
+src/util/resolver.conf
src/vpn/Makefile
-src/chat/Makefile
+src/vpn/vpn.conf
+src/integration-tests/Makefile
pkgconfig/Makefile
pkgconfig/gnunetarm.pc
pkgconfig/gnunetblock.pc