X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=93559e436322b25db5631bcb84d114dac72b8b89;hb=58082a82b9b089de618dfe693e9342e078437451;hp=4dae1ea0c59f4155b1b6d56fb1f41e5bbea623b4;hpb=87509e6096da2f4c7a8359da338574f939d01f13;p=oweals%2Fgnunet.git diff --git a/configure.ac b/configure.ac index 4dae1ea0c..93559e436 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.1],[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.1]) +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]) @@ -152,7 +152,7 @@ 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 @@ -172,6 +172,7 @@ AC_SUBST(DEFAULT_INTERFACE) # 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") @@ -320,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]) @@ -782,15 +775,48 @@ AC_ARG_ENABLE([testruns], AC_MSG_RESULT($enable_test_run) AM_CONDITIONAL([ENABLE_TEST_RUN], [test "x$enable_tests_run" = "xyes"]) + +# should monkey be used when running (certain) services? +AC_MSG_CHECKING(whether to run with monkey) +AC_ARG_ENABLE([monkey], + [AS_HELP_STRING([--enable-monkey], [enable running with monkey])], + [enable_monkey=${enableval}], + [enable_monkey=no]) +AC_MSG_RESULT($enable_monkey) +AM_CONDITIONAL([ENABLE_MONKEY], [test "x$enable_monkey" = "xyes"]) +if test "x$enable_monkey" = "xyes" +then + MONKEYPREFIX="monkey" +else + MONKEYPREFIX="" +fi +AC_SUBST(MONKEYPREFIX) + + # 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], @@ -871,21 +897,29 @@ 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 @@ -912,6 +946,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 @@ -933,6 +968,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.])