X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=42884d05bb19b9222d5a01e448d4392b84a42ab3;hb=cb023645f02e119debf6124da07b90554b8542aa;hp=f575af17f26c0c0a796fad3d0a07e0afdfd3207f;hpb=d6d37a302aec13f96d9a52b26c4beaac59372429;p=oweals%2Fgnunet.git diff --git a/configure.ac b/configure.ac index f575af17f..42884d05b 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]) @@ -221,13 +221,25 @@ fi # libgcrypt gcrypt=0 -AM_PATH_LIBGCRYPT(1.2.0, gcrypt=1) +NEED_LIBGCRYPT_API=1 +NEED_LIBGCRYPT_VERSION=1.4.2 + + +AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION", gcrypt=1) AC_CHECK_DECLS([gcry_mpi_lshift], [], [], [[#include ]]) if test $gcrypt = 0 then - AC_MSG_ERROR([GNUnet needs libgcrypt]) + AC_MSG_ERROR([[ +*** +*** You need libgcrypt to build this program. +** This library is for example available at +*** ftp://ftp.gnupg.org/gcrypt/libgcrypt/ +*** (at least version $NEED_LIBGCRYPT_VERSION (API $NEED_LIBGCRYPT_API) +*** is required.) +***]]) fi +AC_DEFINE_UNQUOTED([NEED_LIBGCRYPT_VERSION], "$NEED_LIBGCRYPT_VERSION", [required libgcrypt version]) # Adam shostack suggests the following for Windows: # -D_FORTIFY_SOURCE=2 -fstack-protector-all @@ -358,6 +370,32 @@ then else AM_CONDITIONAL(HAVE_LIBCURL, false) fi + + +# libidn +AC_MSG_CHECKING([if Libidn can be used]) +AC_ARG_WITH(libidn, AC_HELP_STRING([--with-libidn=[DIR]], + [Support IDN (needs GNU Libidn)]), +libidn=$withval, libidn=yes) +if test "$libidn" != "no"; then + if test "$libidn" != "yes"; then + LDFLAGS="${LDFLAGS} -L$libidn/lib" + 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]) +fi +AC_MSG_RESULT($libidn) + + + # restore LIBS LIBS=$SAVE_LIBS @@ -375,6 +413,34 @@ else 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 + +#libgtop +PKG_CHECK_MODULES(LIBGTOP,libgtop-2.0, [gtop=true] , [gtop=false] ) +if test x$gtop = xfalse +then + AM_CONDITIONAL(HAVE_LIBGTOP, false) + AC_MSG_WARN([GNUnet requires libgtop]) +else + AM_CONDITIONAL(HAVE_LIBGTOP, true) + AC_DEFINE([HAVE_LIBGTOP],[1],[Have libgtop]) + LIBS="$LIBS $LIBGTOP_LIBS" + CFLAGS="$CFLAGS $LIBGTOP_CFLAGS" +fi + + AC_CHECK_HEADERS([nss.h],[nss=true],[nss=false]) @@ -560,10 +626,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])]) @@ -721,7 +794,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]) +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 @@ -800,6 +873,42 @@ AC_ARG_WITH(sudo, AC_SUBST(SUDO_BINARY) AM_CONDITIONAL([HAVE_SUDO], [test "x$SUDO_BINARY" != "x" -o -w /]) + +# test for nssdir +AC_MSG_CHECKING(with nssdir) +AC_ARG_WITH(nssdir, + [ --with-nssdir=PATH where to install NSS plugins], + [AC_MSG_RESULT("$with_nssdir") + case $with_nssdir in + no) + NSS_DIR= + install_nss=0 + ;; + yes) + NSS_DIR="/lib" + install_nss=1 + ;; + *) + NSS_DIR=$with_nssdir + install_nss=1 + ;; + esac + ], + [ + if test "x$SUDO_BINARY" != "x" -o -w / + then + NSS_DIR="/lib" + install_nss=1 + AC_MSG_RESULT([yes, to /lib]) + else + NSS_DIR= + install_nss=0 + AC_MSG_RESULT([no]) + fi + ]) +AC_SUBST(NSS_DIR) +AM_CONDITIONAL([INSTALL_NSS], [test "x$install_nss" != "x0"]) + # test for gnunetdns group name GNUNETDNS_GROUP=gnunetdns AC_MSG_CHECKING(for gnunetdns group name) @@ -855,6 +964,37 @@ AM_CONDITIONAL(HAVE_GNUTLS, test x$gnutls = xtrue) AC_DEFINE_UNQUOTED([HAVE_GNUTLS], $gnutls, [We have gnutls]) +# Test if we are building for superMUC +llapi=0 +AC_MSG_CHECKING(if testbed should use IBM LoadLeveler to run on SuperMUC) +AC_ARG_WITH([ll], + [AS_HELP_STRING([--with-ll=PFX], + [use IBM LoadLeveler (installed at PFX) for running testbed on SuperMUC]. Default is no)], + [AC_MSG_RESULT([$with_ll]) + case $with_ll in + no) + ;; + yes) + AC_CHECK_HEADERS([llapi.h], + AC_CHECK_LIB([llapi], [llsubmit], + llapi=true, + AC_MSG_ERROR(libllapi not found but --with-llapi given)), + AC_MSG_ERROR(llapi.h not found but --with-llapi given)) + ;; + *) + LDFLAGS="-L$with_ll/lib $LDFLAGS" + CPPFLAGS="-I$with_ll/include $CPPFLAGS" + AC_CHECK_HEADERS([llapi.h], + AC_CHECK_LIB([llapi], [llsubmit], + llapi=true, + AC_MSG_ERROR(libllapi not found but --with-llapi given)), + AC_MSG_ERROR(llapi.h not found but --with-llapi given)) + ;; + esac + ], + [AC_MSG_RESULT(--with-ll not specified)]) +AM_CONDITIONAL([WITH_LL], [test "x$llapi" = "xtrue"]) +AC_DEFINE_UNQUOTED(WITH_LL, $llapi, [Do we have to use IBM LoadLeveler]) # should 'make check' run tests? AC_MSG_CHECKING(whether to run tests) @@ -925,6 +1065,15 @@ AC_ARG_ENABLE([experimental], AC_MSG_RESULT($enable_experimental) AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"]) +# should memory statistics be kept (very expensive CPU-wise!) +AC_MSG_CHECKING(whether to create expensive statistics on memory use) +AC_ARG_ENABLE([heapstats], + [AS_HELP_STRING([--enable-heapstats], [enable expensive heap statistics])], + [enable_heapstats=1], + [enable_heapstats=0]) +AC_MSG_RESULT($enable_heapstats) +AC_DEFINE_UNQUOTED([ENABLE_HEAP_STATISTICS],$enable_heapstats,[enable expensive heap statistics]) + # should code be enabled that works around missing OS functionality on Windows? # used for test cases if test $build_target = "mingw" @@ -1047,6 +1196,27 @@ 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 "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 @@ -1059,11 +1229,14 @@ 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 @@ -1103,11 +1276,12 @@ src/regex/Makefile src/statistics/Makefile src/statistics/statistics.conf src/stream/Makefile +src/sysmon/Makefile +src/sysmon/sysmon.conf 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 @@ -1118,25 +1292,37 @@ 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 @@ -1191,25 +1377,38 @@ fi AC_MSG_NOTICE([******************************************** -Please make sure that you have created a user and group 'gnunet' -and additionally a group 'gnunetdns'. Make sure that '/var/lib/gnunet' -is owned (and writable) by user 'gnunet'. Then, you can compile GNUnet -with - make +Please make sure NOW that you have created a user and group 'gnunet' +and additionally a group 'gnunetdns': + addgroup gnunetdns + adduser gnunet + +Make sure that '/var/lib/gnunet' is owned (and writable) by user +'gnunet'. Then, you can compile GNUnet with + make + After that, run (if necessary as 'root') make install to install everything. -Then, in order to start your peer, run as the 'gnunet' user - mkdir ~gnunet/.gnunet/ - touch ~gnunet/.gnunet/gnunet.conf - gnunet-arm -s -Each GNUnet user should also be added to the 'gnunet' group (may -require fresh login to come into effect) and create an (at least -initially) empty configuration file: - mkdir $HOME/.gnunet/ - touch $HOME/.gnunet/gnunet.conf +Each GNUnet user should be added to the 'gnunet' group (may +require fresh login to come into effect): + adduser $USERNAME gnunet +(run the above command as root once for each of your users, replacing +"$USERNAME" with the respective login names). If you have a global IP +address, no further configuration is required. -Optionally, download and compile: -- gnunet-gtk to get a GUI for file-sharing and configuration. +Optionally, download and compile gnunet-gtk to get a GUI for +file-sharing and configuration. This is particularly recommended +if your network setup is non-trivial, as gnunet-setup can be +used to test in the GUI if your network configuration is working. +gnunet-setup should be run as the "gnunet" user under X. As it +does very little with the network, running it as "root" is likely +also harmless. You can also run it as a normal user, but then +you have to copy ~/.gnunet/gnunet.conf" over to the "gnunet" user's +home directory in the end. + +Once you have configured your peer, run (as the 'gnunet' user) + gnunet-arm -s +to start the peer. You can then run the various GNUnet-tools as +your "normal" user (who should only be in the group 'gnunet'). ********************************************])