X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=7fb10cf322dcd7beeefd005925d2f5c5af108dd9;hb=ffad59b491bb53819aa1ee258dc9dfb03f874cec;hp=8fc49aadc5b2e11f91afa58a116445aad6c0e1b6;hpb=438d1dd06f683f424c4c9958918778804c9f5519;p=oweals%2Fgnunet.git diff --git a/configure.ac b/configure.ac index 8fc49aadc..7fb10cf32 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # This file is part of GNUnet. -# (C) 2001--2011 Christian Grothoff (and other contributing authors) +# (C) 2001--2012 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 @@ -22,13 +22,13 @@ # AC_PREREQ(2.61) # Checks for programs. -AC_INIT([gnunet], [0.9.0pre4],[bug-gnunet@gnu.org]) +AC_INIT([gnunet], [0.9.2],[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.2]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_CONFIG_HEADERS([gnunet_config.h]) AH_TOP([#define _GNU_SOURCE 1]) @@ -79,12 +79,14 @@ case "$host_os" in 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*) @@ -94,6 +96,7 @@ freebsd*) build_target="freebsd" LIBPREFIX= DLLDIR=lib + UNIXONLY="#" ;; openbsd*) AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system]) @@ -102,12 +105,14 @@ openbsd*) 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]) @@ -117,6 +122,7 @@ netbsd*) build_target="solaris" LIBPREFIX= DLLDIR=lib + UNIXONLY="#" ;; *arm-linux*) AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux system]) @@ -124,6 +130,7 @@ netbsd*) build_target="linux" LIBPREFIX= DLLDIR=lib + UNIXONLY="#" ;; *cygwin*) AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system]) @@ -135,6 +142,7 @@ netbsd*) LIBPREFIX=lib DLLDIR=bin AC_PROG_CXX + UNIXONLY="" ;; *mingw*) AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system]) @@ -144,20 +152,27 @@ netbsd*) 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" + CPPFLAGS="-D_WIN32_WINNT=0x0501 -DHAVE_STAT64=1 $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") @@ -201,6 +216,27 @@ then 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)]), @@ -285,29 +321,21 @@ LIBCURL_CHECK_CONFIG(,7.20.1,,AC_MSG_ERROR([GNUnet requires libcurl >= 7.20.1])) # restore LIBS LIBS=$SAVE_LIBS -AC_ARG_ENABLE([ats], - [AS_HELP_STRING([--enable-ats], [enable ATS code])], - [enable_ats=${enableval}], - [enable_ats=no]) -if test x${enable_ats} = xyes + +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 - 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_LIBGLPK, false) - AC_MSG_RESULT([no]) + AC_MSG_WARN([GNUnet requires GLPK >= 4.32]) +else + AM_CONDITIONAL(HAVE_LIBGLPK, true) + AC_DEFINE([HAVE_LIBGLPK],[1],[Have GLPK]) fi + # test for kvm and kstat (for CPU stats under BSD/Solaris) AC_CHECK_LIB([kvm],[kvm_open]) AC_CHECK_LIB([kstat],[kstat_open]) @@ -347,6 +375,18 @@ fi # 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 @@ -562,7 +602,7 @@ AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd]) 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" != : @@ -625,7 +665,7 @@ AC_FUNC_VPRINTF 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 @@ -704,6 +744,28 @@ AC_ARG_WITH(sudo, 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], @@ -716,12 +778,27 @@ 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])], + [AS_HELP_STRING([--enable-expensivetests], [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 ports be open for Java services? +AC_MSG_CHECKING(whether to enable ports for gnunet-java) +AC_ARG_ENABLE([javaports], + [AS_HELP_STRING([--enable-javaports], [use non-zero ports for services with Java bindings (default is NO)])], + [enable_java_ports=${enableval}], + [enable_java_ports=no]) +AC_MSG_RESULT($enable_java_ports) +if test "x$enable_java_ports" = "xyes" +then + JAVAPORT="" +else + JAVAPORT="$UNIXONLY" +fi +AC_SUBST(JAVAPORT) + # should benchmarks be run? AC_MSG_CHECKING(whether to run benchmarks during make check) AC_ARG_ENABLE([benchmarks], @@ -781,32 +858,61 @@ m4/Makefile 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/gns/Makefile +src/gns/gns.conf src/hello/Makefile src/include/Makefile src/include/gnunet_directories.h src/hostlist/Makefile src/mesh/Makefile +src/mesh/mesh.conf +src/mysql/Makefile +src/namestore/Makefile +src/namestore/namestore.conf src/nat/Makefile src/nse/Makefile +src/nse/nse.conf src/peerinfo/Makefile +src/peerinfo/peerinfo.conf src/peerinfo-tool/Makefile +src/postgres/Makefile +src/pt/Makefile +src/regex/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 @@ -822,6 +928,7 @@ pkgconfig/gnunethello.pc pkgconfig/gnunetnat.pc pkgconfig/gnunetnse.pc pkgconfig/gnunetpeerinfo.pc +pkgconfig/gnunetregex.pc pkgconfig/gnunetstatistics.pc pkgconfig/gnunettesting.pc pkgconfig/gnunettransport.pc @@ -843,6 +950,12 @@ then AC_MSG_NOTICE([NOTICE: sqlite not found. sqLite support will not be compiled.]) fi +# java ports +if test "x$enable_java_ports" = "xyes" +then + AC_MSG_NOTICE([NOTICE: opening ports for gnunet-java bindings by default.]) +fi + if test "x$lmhd" != "x1" then AC_MSG_NOTICE([NOTICE: libmicrohttpd not found, http transport will not be installed.])