X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=c676164be1e288bb022e93f493cae87edd69d79a;hb=0f87ae3787762ea32fb3d9580d13782cb2aacdd2;hp=3caaf253a2708a4e8b33eea7fa8385b683b719d0;hpb=798b1b3431ccf345a93bd01413a64d272e530c6c;p=oweals%2Fgnunet.git diff --git a/configure.ac b/configure.ac index 3caaf253a..c676164be 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # This file is part of GNUnet. -# (C) 2001--2012 Christian Grothoff (and other contributing authors) +# (C) 2001--2013 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.3],[bug-gnunet@gnu.org]) +AC_INIT([gnunet], [0.9.5a],[bug-gnunet@gnu.org]) AC_CANONICAL_TARGET AC_CANONICAL_HOST AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE([gnunet], [0.9.3]) +AM_INIT_AUTOMAKE([gnunet], [0.9.5a]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_CONFIG_HEADERS([gnunet_config.h]) AH_TOP([#define _GNU_SOURCE 1]) @@ -43,6 +43,7 @@ AC_PROG_LN_S AC_PROG_MAKE_SET AM_PROG_CC_C_O LT_INIT([disable-static dlopen win32-dll]) +LT_CONFIG_LTDL_DIR([libltdl]) LTDL_INIT AC_SUBST(LTDLINCL) AC_SUBST(LIBLTDL) @@ -157,7 +158,7 @@ linux*) 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 -DHAVE_STAT64=1 $CPPFLAGS" + CPPFLAGS="-D_WIN32_WINNT=0x0501 -DHAVE_STAT64=1 -D__USE_MINGW_ANSI_STDIO=1 $CPPFLAGS" build_target="mingw" AC_PROG_CXX LIBPREFIX=lib @@ -222,7 +223,7 @@ fi # libgcrypt gcrypt=0 NEED_LIBGCRYPT_API=1 -NEED_LIBGCRYPT_VERSION=1.4.2 +NEED_LIBGCRYPT_VERSION=1.6.0 AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION", gcrypt=1) @@ -361,6 +362,18 @@ AC_RUN_IFELSE( AC_LANG_POP(C) fi # $build = $target +# check for bluetooth library +bluetooth=0 +AC_CHECK_LIB(bluetooth, ba2str, bluetooth=1, bluetooth=0) +if test "$bluetooth" = 1 +then + AM_CONDITIONAL(HAVE_LIBBLUETOOTH, true) + AC_DEFINE([HAVE_LIBBLUETOOTH],[1],[Have bluetooth library]) +else + AM_CONDITIONAL(HAVE_LIBBLUETOOTH, false) +fi + + # libcurl LIBCURL_CHECK_CONFIG(,7.21.3,curl=1,curl=0) if test "$curl" = 1 @@ -383,25 +396,20 @@ if test "$libidn" != "no"; then CPPFLAGS="${CPPFLAGS} -I$libidn/include" fi AC_CHECK_HEADER(idna.h, - AC_CHECK_LIB(idn, stringprep_check_version, - [libidn=yes LIBS="${LIBS} -lidn"], libidn=no), - libidn=no) -fi -if test "$libidn" != "no" ; then - AC_DEFINE(LIBIDN, 1, [Define to 1 if you want IDN support.]) - else - AC_MSG_FAILURE([Libidn not found]) + AC_CHECK_LIB(idn, stringprep_check_version, + [libidn=yes LIBS="${LIBS} -lidn"], + AC_MSG_FAILURE([GNUnet requires libidn])), + AC_MSG_FAILURE([GNUnet requires libidn])) fi AC_MSG_RESULT($libidn) - - # restore LIBS LIBS=$SAVE_LIBS AC_CHECK_HEADERS([glpk.h],[glpk=true],[gplk=false]) -AC_CHECK_LIB([glpk],[glp_create_prob],,[gplk=false]) +# GLPK must support glpk_init_env, version >= 4.43 +AC_CHECK_LIB([glpk],[glp_init_env],,[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 @@ -485,8 +493,12 @@ AC_HEADER_STDC # Check for headers that are ALWAYS required AC_CHECK_HEADERS([fcntl.h math.h errno.h ctype.h limits.h stdio.h stdlib.h string.h unistd.h stdarg.h signal.h locale.h sys/stat.h sys/types.h],,AC_MSG_ERROR([Compiling GNUnet requires standard UNIX headers files])) + +# Check for libltdl header (#2999) +AC_CHECK_HEADERS([ltdl.h],,AC_MSG_ERROR([Compiling GNUnet requires libltdl headers (try installing libltdl-dev)])) + # Checks for headers that are only required on some systems or opional (and where we do NOT abort if they are not there) -AC_CHECK_HEADERS([malloc.h malloc/malloc.h langinfo.h sys/param.h sys/mount.h sys/statvfs.h sys/select.h sockLib.h sys/mman.h sys/msg.h sys/vfs.h arpa/inet.h fcntl.h libintl.h netdb.h netinet/in.h netinet/in_systm.h sys/ioctl.h sys/socket.h sys/time.h unistd.h kstat.h sys/sysinfo.h kvm.h sys/file.h sys/resource.h ifaddrs.h mach/mach.h stddef.h sys/timeb.h terminos.h argz.h ucred.h endian.h sys/endian.h execinfo.h]) +AC_CHECK_HEADERS([malloc.h malloc/malloc.h langinfo.h sys/param.h sys/mount.h sys/statvfs.h sys/select.h sockLib.h sys/mman.h sys/msg.h sys/vfs.h arpa/inet.h fcntl.h libintl.h netdb.h netinet/in.h netinet/in_systm.h netinet/ip.h sys/ioctl.h sys/socket.h sys/time.h unistd.h kstat.h sys/sysinfo.h kvm.h sys/file.h sys/resource.h ifaddrs.h mach/mach.h stddef.h sys/timeb.h terminos.h argz.h ucred.h endian.h sys/endian.h execinfo.h]) SAVE_LDFLAGS=$LDFLAGS SAVE_CPPFLAGS=$CPPFLAGS @@ -555,14 +567,38 @@ AM_CONDITIONAL(HAVE_POSTGRES, test x$postgres = xtrue) AC_SUBST(POSTGRES_CPPFLAGS) AC_SUBST(POSTGRES_LDFLAGS) -# test for libz (maybe required for linking mysql) -zlib=1 -AC_CHECK_LIB(z, compress,,zlib=0) -AM_CONDITIONAL(HAVE_ZLIB, test x$zlib = x1) -if test "$zlib" != 1 -then - AC_MSG_ERROR([GNUnet requires zlib]) -fi +# test for zlib +SAVE_LDFLAGS=$LDFLAGS +SAVE_CPPFLAGS=$CPPFLAGS +AC_ARG_WITH(zlib, + [ --with-zlib[[=DIR]] use libz in DIR], + [AS_IF([test "$withval" = "no"], + [AC_MSG_ERROR([GNUnet requires zlib])], + [test "$withval" != "yes"], + [ + Z_DIR=$withval + CPPFLAGS="${CPPFLAGS} -I$withval/include" + LDFLAGS="${LDFLAGS} -L$withval/lib" + ]) + ]) +AC_CHECK_HEADER(zlib.h, + [], + [AC_MSG_ERROR([GNUnet requires zlib])]) +AC_CHECK_LIB(z, compress2, + [ + AC_DEFINE([HAVE_ZLIB], [], [Have compression library]) + if test "x${Z_DIR}" != "x"; then + Z_CFLAGS="-I${Z_DIR}/include" + Z_LIBS="-L${Z_DIR}/lib -lz" + else + Z_LIBS="-lz" + fi], + [AC_MSG_ERROR([GNUnet requires zlib])]) +AC_SUBST(Z_CFLAGS) +AC_SUBST(Z_LIBS) + +LDFLAGS=$SAVE_LDFLAGS +CPPFLAGS=$SAVE_CPPFLAGS # mysql & windows AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include ]) @@ -598,10 +634,17 @@ AC_ARG_WITH(mysql, fi ], [AC_MSG_RESULT([--with-mysql not specified]) - LDFLAGS="-L/usr/lib/mysql $LDFLAGS $ZLIBS" + if test -d "/usr/lib64/mysql"; then + MYSQL_LIBDIR="/usr/lib64/mysql" + elif test -d "/usr/lib/mysql"; then + MYSQL_LIBDIR="/usr/lib/mysql" + else + MYSQL_LIBDIR="/usr/lib" + fi + LDFLAGS="-L$MYSQL_LIBDIR $LDFLAGS $ZLIBS" AC_CHECK_LIB(mysqlclient, mysql_init, [AC_CHECK_HEADERS(mysql/mysql.h, - MYSQL_LDFLAGS="-L/usr/lib/mysql" + MYSQL_LDFLAGS="-L$MYSQL_LIBDIR" mysql=true , [], [$CYGWIN_MYSQL_MAGIC])]) @@ -759,7 +802,7 @@ AC_FUNC_VPRINTF AC_HEADER_SYS_WAIT AC_TYPE_OFF_T AC_TYPE_UID_T -AC_CHECK_FUNCS([atoll stat64 strnlen mremap setrlimit sysconf initgroups strndup gethostbyname2 getpeerucred getpeereid setresuid $funcstocheck getifaddrs freeifaddrs getresgid mallinfo malloc_size malloc_usable_size getrusage]) +AC_CHECK_FUNCS([atoll stat64 strnlen mremap getrlimit setrlimit sysconf initgroups strndup gethostbyname2 getpeerucred getpeereid setresuid $funcstocheck getifaddrs freeifaddrs getresgid mallinfo malloc_size malloc_usable_size getrusage random srandom stat statfs statvfs]) # restore LIBS LIBS=$SAVE_LIBS @@ -929,6 +972,44 @@ AM_CONDITIONAL(HAVE_GNUTLS, test x$gnutls = xtrue) AC_DEFINE_UNQUOTED([HAVE_GNUTLS], $gnutls, [We have gnutls]) +# Test if we are building for superMUC +AC_MSG_CHECKING(if testbed should use IBM LoadLeveler to run on SuperMUC) +AC_ARG_ENABLE([ll], + [AS_HELP_STRING([--enable-ll], + [build GNUnet testbed for use with IBM LoadLeveler for running testbed on + SuperMUC (default is NO)])], + [if test "x$enable_ll" = "xno" + then + ll=0 + else + ll=1 + fi], + [ll=0 + enable_ll=no]) +AC_MSG_RESULT($enable_ll) +AM_CONDITIONAL([ENABLE_LL], [test "x$ll" = "x1"]) +AC_DEFINE_UNQUOTED([ENABLE_LL], [$ll], [Build with LL support]) + +# Check if NSE has to send timestamp information to testbed logger for +# generating histogram of messages received +AC_MSG_CHECKING(if NSE has to send timestamp information to testbed logger) +AC_ARG_ENABLE([nse-histogram], + [AS_HELP_STRING([--enable-nse-histogram], + [have NSE send timestamp information to testbed logger for generating + histogram of received messages. NOT useful for production (default is + NO)])], + [if test "x$enableval" = "xno" + then + nse_histogram=0 + else + nse_histogram=1 + fi], + [nse_histogram=0 + enable_nse_histogram=no]) +AC_MSG_RESULT($enable_nse_histogram) +AM_CONDITIONAL([ENABLE_NSE_HISTOGRAM], [test "x$nse_histogram" = "x1"]) +AC_DEFINE_UNQUOTED([ENABLE_NSE_HISTOGRAM], [$nse_histogram], + [have NSE send timestamp information to testbed logger]) # should 'make check' run tests? AC_MSG_CHECKING(whether to run tests) @@ -990,6 +1071,15 @@ AC_ARG_ENABLE([benchmarks], AC_MSG_RESULT($enable_benchmarks) AM_CONDITIONAL([HAVE_BENCHMARKS], [test "x$enable_benchmarks" = "xyes"]) +# should gnunet-testing be compiled +AC_MSG_CHECKING(wether to compile gnunet-testing) +AC_ARG_ENABLE([testing], + [AS_HELP_STRING([--disable-testing], [do not build gnunet-testing])], + [enable_testing=${enableval}], + [enable_testing=yes]) +AC_MSG_RESULT($enable_testing) +AM_CONDITIONAL([HAVE_TESTING], [test "x$enable_testing" = "xyes"]) + # should experimental code be compiled (code that may not yet compile)? AC_MSG_CHECKING(whether to compile experimental code) AC_ARG_ENABLE([experimental], @@ -1130,11 +1220,33 @@ AC_MSG_RESULT($use_gcov) AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"]) +# version info +AC_PATH_PROG(svnversioncommand, svnversion) +AC_PATH_PROG(gitcommand, git) +if test "X$svnversioncommand" = "X" || test `$svnversioncommand -n '.'` = "exported" +then + if test "X$gitcommand" = "X" + then + AC_DEFINE_UNQUOTED(VCS_VERSION, ["release"], [repository svn version]) + else + gitver=$(git log -1 | grep "git-svn-id" | sed -e 's/.*@\([[0-9]]\+\) .*/\1/') + if test "X$gitver" = "X" + then + AC_DEFINE_UNQUOTED(VCS_VERSION, ["release"], [repository svn version]) + else + AC_DEFINE_UNQUOTED(VCS_VERSION, ["svn-$gitver"], [repository svn version]) + fi + fi +else + AC_DEFINE_UNQUOTED(VCS_VERSION, ["svn-`svnversion -n`"], [repository svn version]) +fi + AC_CONFIG_FILES([ Makefile contrib/Makefile doc/Makefile doc/man/Makefile +doc/doxygen/Makefile m4/Makefile po/Makefile.in src/Makefile @@ -1142,11 +1254,12 @@ src/arm/Makefile src/arm/arm.conf src/ats/Makefile src/ats/ats.conf +src/ats-tool/Makefile src/block/Makefile -src/chat/Makefile -src/chat/chat.conf src/core/Makefile src/core/core.conf +src/consensus/Makefile +src/consensus/consensus.conf src/datacache/Makefile src/datastore/Makefile src/datastore/datastore.conf @@ -1157,6 +1270,8 @@ src/dns/dns.conf src/dv/Makefile src/dv/dv.conf src/exit/Makefile +src/experimentation/Makefile +src/experimentation/experimentation.conf src/fragmentation/Makefile src/fs/Makefile src/fs/fs.conf @@ -1164,8 +1279,12 @@ src/gns/Makefile src/gns/gns.conf src/gns/nss/Makefile src/hello/Makefile +src/identity/Makefile +src/identity/identity.conf +src/psycstore/Makefile src/include/Makefile src/include/gnunet_directories.h +src/integration-tests/Makefile src/hostlist/Makefile src/lockmanager/Makefile src/lockmanager/lockmanager.conf @@ -1183,14 +1302,17 @@ src/peerinfo-tool/Makefile src/postgres/Makefile src/pt/Makefile src/regex/Makefile +src/regex/regex.conf +src/scalarproduct/Makefile +src/scalarproduct/scalarproduct.conf +src/set/Makefile +src/set/set.conf src/statistics/Makefile src/statistics/statistics.conf -src/stream/Makefile src/template/Makefile src/testbed/Makefile src/testbed/testbed.conf src/testing/Makefile -src/testing_old/Makefile src/topology/Makefile src/transport/Makefile src/transport/transport.conf @@ -1199,27 +1321,38 @@ src/util/Makefile src/util/resolver.conf src/vpn/Makefile src/vpn/vpn.conf -src/integration-tests/Makefile pkgconfig/Makefile +pkgconfig/gnunetats.pc pkgconfig/gnunetarm.pc pkgconfig/gnunetblock.pc pkgconfig/gnunetcore.pc pkgconfig/gnunetdatacache.pc pkgconfig/gnunetdatastore.pc pkgconfig/gnunetdht.pc -pkgconfig/gnunetdhtlog.pc +pkgconfig/gnunetdns.pc +pkgconfig/gnunetdnsparser.pc pkgconfig/gnunetdv.pc pkgconfig/gnunetfragmentation.pc pkgconfig/gnunetfs.pc +pkgconfig/gnunetgns.pc pkgconfig/gnunethello.pc +pkgconfig/gnunetlockmanager.pc +pkgconfig/gnunetmesh.pc +pkgconfig/gnunetmysql.pc +pkgconfig/gnunetnamestore.pc pkgconfig/gnunetnat.pc pkgconfig/gnunetnse.pc pkgconfig/gnunetpeerinfo.pc +pkgconfig/gnunetpostgres.pc pkgconfig/gnunetregex.pc pkgconfig/gnunetstatistics.pc +pkgconfig/gnunetstream.pc +pkgconfig/gnunettestbed.pc pkgconfig/gnunettesting.pc pkgconfig/gnunettransport.pc +pkgconfig/gnunettun.pc pkgconfig/gnunetutil.pc +pkgconfig/gnunetvpn.pc ]) AC_OUTPUT @@ -1243,6 +1376,12 @@ then AC_MSG_NOTICE([NOTICE: libcurl not found. http client support will not be compiled.]) fi +# bluetooth +if test "x$bluetooth" = "x0" +then + AC_MSG_NOTICE([NOTICE: bluetooth library not found. bluetooth support will not be compiled.]) +fi + #gnutls if test x$gnutls != xtrue then