# 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
#
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])
# 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)
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 <glpk.h>]])
if test x$gplk = xfalse
AC_DEFINE([HAVE_LIBGLPK],[1],[Have GLPK])
fi
-
+# test for glib
+# Minimum required version for glibtop is 2.6.0
+AM_PATH_GLIB_2_0(2.6.0, [glib2=true] , [glib2=false] ,)
+if test x$glib2 = xfalse
+then
+ AM_CONDITIONAL(HAVE_GLIB2, false)
+ AC_MSG_WARN([GNUnet requires GLIB >= 2.6.0])
+else
+ AM_CONDITIONAL(HAVE_GLIB2, true)
+ AC_DEFINE([HAVE_GLIB2],[1],[Have glib2])
+ LIBS="$LIBS $GLIB_LIBS"
+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
+fi
AC_CHECK_HEADERS([nss.h],[nss=true],[nss=false])
if test x$nss = xfalse
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])])
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])
# restore LIBS
LIBS=$SAVE_LIBS
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])
# should 'make check' run tests?
AC_MSG_CHECKING(whether to run tests)
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
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
src/postgres/Makefile
src/pt/Makefile
src/regex/Makefile
+src/set/Makefile
+src/set/set.conf
src/statistics/Makefile
src/statistics/statistics.conf
src/stream/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
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
projects / oweals / gnunet.git / blobdiff