X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=b32f927404031753f8c7aeea64ac60f34d0a94a1;hb=f74b67b30e97b871ae37575b64179668b15abab0;hp=251433f557992e099b6a26298e7a1537dde80dbb;hpb=d0b561b742d4b448786059b4a34f7f7606038212;p=oweals%2Fgnunet.git diff --git a/configure.ac b/configure.ac index 251433f55..b32f92740 100644 --- a/configure.ac +++ b/configure.ac @@ -70,6 +70,9 @@ DEFAULT_INTERFACE="\"eth0\"" funcstocheck="getnameinfo gethostname gethostbyname gethostbyaddr getaddrinfo" +# Srcdir in a form that native compiler understands (i.e. DOS path on W32) +native_srcdir=$srcdir + # Check system type case "$host_os" in *darwin* | *rhapsody* | *macosx*) @@ -91,7 +94,7 @@ linux*) UNIXONLY="#" AC_PATH_XTRA ;; -freebsd*) +*freebsd*) AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system]) AC_DEFINE_UNQUOTED(FREEBSD,1,[This is a FreeBSD system]) CFLAGS="-D_THREAD_SAFE $CFLAGS" @@ -100,7 +103,7 @@ freebsd*) DLLDIR=lib UNIXONLY="#" ;; -openbsd*) +*openbsd*) AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system]) AC_DEFINE_UNQUOTED(OPENBSD,1,[This is an OpenBSD system]) LIBS=`echo $LIBS | sed -e "s/-ldl//"` @@ -109,7 +112,7 @@ openbsd*) DLLDIR=lib UNIXONLY="#" ;; -netbsd*) +*netbsd*) AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system]) AC_DEFINE_UNQUOTED(NETBSD,1,[This is a NetBSD system]) LIBPREFIX= @@ -161,6 +164,7 @@ netbsd*) DLLDIR=bin UNIXONLY="" funcstocheck="" + native_srcdir=$(cd $srcdir; pwd -W) ;; gnu*) AC_DEFINE_UNQUOTED(GNU,1,[This is a GNU system]) @@ -217,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 @@ -354,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 @@ -556,10 +598,15 @@ 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" + 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])]) @@ -617,15 +664,15 @@ AC_ARG_WITH(microhttpd, AC_CHECK_LIB([microhttpd], [MHD_start_daemon], [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.18]) AC_RUN_IFELSE([ - #include "$srcdir/src/include/platform.h" + #include "$native_srcdir/src/include/platform.h" #include int main () { return MHD_VERSION >= 0x0091200 ? 0 : 1; } ], [ AC_MSG_RESULT(ok) lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]), - [],[#include "$srcdir/src/include/platform.h" + [],[#include "$native_srcdir/src/include/platform.h" #include ]),, - [#include "$srcdir/src/include/platform.h"]) + [#include "$native_srcdir/src/include/platform.h"]) ;; *) LDFLAGS="-L$with_microhttpd/lib $LDFLAGS" @@ -636,15 +683,15 @@ AC_ARG_WITH(microhttpd, EXT_LIB_PATH="-L$with_microhttpd/lib $EXT_LIB_PATH" [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.18]) AC_RUN_IFELSE([ - #include "$srcdir/src/include/platform.h" + #include "$native_srcdir/src/include/platform.h" #include int main () { return MHD_VERSION >= 0x0091200 ? 0 : 1; } ], [ AC_MSG_RESULT(ok) lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]), - [],[#include "$srcdir/src/include/platform.h" + [],[#include "$native_srcdir/src/include/platform.h" #include ]),, - [#include "$srcdir/src/include/platform.h"]) + [#include "$native_srcdir/src/include/platform.h"]) ;; esac ], @@ -654,15 +701,15 @@ AC_ARG_WITH(microhttpd, AC_CHECK_LIB([microhttpd], [MHD_start_daemon], [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.18]) AC_RUN_IFELSE([ - #include "$srcdir/src/include/platform.h" + #include "$native_srcdir/src/include/platform.h" #include int main () { return MHD_VERSION >= 0x0091200 ? 0 : 1; } ], [ AC_MSG_RESULT(ok) lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]), - [],[#include "$srcdir/src/include/platform.h" + [],[#include "$native_srcdir/src/include/platform.h" #include ]),, - [#include "$srcdir/src/include/platform.h"])]) + [#include "$native_srcdir/src/include/platform.h"])]) AM_CONDITIONAL(HAVE_MHD, test x$lmhd = x1) AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd]) @@ -717,7 +764,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 setrlimit sysconf initgroups strndup gethostbyname2 getpeerucred getpeereid setresuid $funcstocheck getifaddrs freeifaddrs getresgid mallinfo malloc_size malloc_usable_size getrusage]) # restore LIBS LIBS=$SAVE_LIBS @@ -796,6 +843,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) @@ -921,6 +1004,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" @@ -1055,6 +1147,7 @@ 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 @@ -1187,24 +1280,38 @@ fi AC_MSG_NOTICE([******************************************** -Please make sure that you have created a user and group 'gnunet' -and additionally a group 'gnunetdns'. 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 $HOME/.gnunet/ - touch $HOME/.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'). ********************************************])