X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=3ab772d6a845efbe40b12483790e37c9d52f8184;hb=49070a397348581d11bd845d46d6ed17de0ccac2;hp=165e66d442ad7ca02ea8599585486f98e462d5ef;hpb=ed40c38220a0c32976a0fda56aec1e7499df858b;p=oweals%2Fgnunet.git diff --git a/configure.ac b/configure.ac index 165e66d44..3ab772d6a 100644 --- a/configure.ac +++ b/configure.ac @@ -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.4],[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.4]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_CONFIG_HEADERS([gnunet_config.h]) AH_TOP([#define _GNU_SOURCE 1]) @@ -370,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 @@ -572,10 +598,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])]) @@ -733,7 +766,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 @@ -812,6 +845,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) @@ -937,6 +1006,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" @@ -1071,6 +1149,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 @@ -1130,25 +1209,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 @@ -1203,25 +1294,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'). ********************************************])