gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r5656 - in GNUnet: . m4 src/applications/advertising src/ap


From: gnunet
Subject: [GNUnet-SVN] r5656 - in GNUnet: . m4 src/applications/advertising src/applications/session src/applications/tbench src/util/os
Date: Mon, 24 Sep 2007 04:17:22 -0600 (MDT)

Author: grothoff
Date: 2007-09-24 04:17:22 -0600 (Mon, 24 Sep 2007)
New Revision: 5656

Removed:
   GNUnet/libltdl/
   GNUnet/m4/mkdir.m4
   GNUnet/m4/mkdirp.m4
Modified:
   GNUnet/INSTALL
   GNUnet/Makefile.am
   GNUnet/bootstrap
   GNUnet/configure.ac
   GNUnet/m4/Makefile.am
   GNUnet/m4/Makefile.in
   GNUnet/src/applications/advertising/Makefile.am
   GNUnet/src/applications/advertising/advertising_test.c
   GNUnet/src/applications/session/Makefile.am
   GNUnet/src/applications/session/http-peer.conf
   GNUnet/src/applications/session/nat-http-peer.conf
   GNUnet/src/applications/session/sessiontest.c
   GNUnet/src/applications/tbench/Makefile.am
   GNUnet/src/applications/tbench/tbenchtest.c
   GNUnet/src/util/os/statuscallstest.c
   GNUnet/todo
Log:
fixing Mantis 1276

Modified: GNUnet/INSTALL
===================================================================
--- GNUnet/INSTALL      2007-09-23 10:31:02 UTC (rev 5655)
+++ GNUnet/INSTALL      2007-09-24 10:17:22 UTC (rev 5656)
@@ -1,13 +1,19 @@
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
-Foundation, Inc.
+Installation Instructions
+*************************
 
-   This file is free documentation; the Free Software Foundation gives
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006 Free Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
 
 Basic Installation
 ==================
 
-   These are generic installation instructions.
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -20,9 +26,9 @@
 
    It can also use an optional file (typically called `config.cache'
 and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
+the results of its tests to speed up reconfiguring.  Caching is
 disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
 
    If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
@@ -32,20 +38,17 @@
 may remove or edit it.
 
    The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
 
 The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
+     `./configure' to configure the package for your system.
 
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
 
   2. Type `make' to compile the package.
 
@@ -67,51 +70,49 @@
 Compilers and Options
 =====================
 
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
-for details on some of the pertinent environment variables.
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about.  Run `./configure --help' for
+details on some of the pertinent environment variables.
 
    You can give `configure' initial values for configuration parameters
 by setting variables in the command line or in the environment.  Here
 is an example:
 
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
 
    *Note Defining Variables::, for more details.
 
 Compiling For Multiple Architectures
 ====================================
 
-   You can compile the package for more than one kind of computer at the
+You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
 source code in the directory that `configure' is in and in `..'.
 
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
 
 Installation Names
 ==================
 
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
 
    In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
+options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
 you can set and what kinds of files go in them.
 
@@ -122,7 +123,7 @@
 Optional Features
 =================
 
-   Some packages pay attention to `--enable-FEATURE' options to
+Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 is something like `gnu-as' or `x' (for the X Window System).  The
@@ -137,11 +138,11 @@
 Specifying the System Type
 ==========================
 
-   There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
 `--build=TYPE' option.  TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:
 
@@ -156,7 +157,7 @@
 need to know the machine type.
 
    If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
+use the option `--target=TYPE' to select the type of system they will
 produce code for.
 
    If you want to _use_ a cross compiler, that generates code for a
@@ -167,9 +168,9 @@
 Sharing Defaults
 ================
 
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
@@ -178,7 +179,7 @@
 Defining Variables
 ==================
 
-   Variables not defined in a site shell script can be set in the
+Variables not defined in a site shell script can be set in the
 environment passed to `configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
@@ -186,14 +187,18 @@
 
      ./configure CC=/usr/local2/bin/gcc
 
-will cause the specified gcc to be used as the C compiler (unless it is
+causes the specified `gcc' to be used as the C compiler (unless it is
 overridden in the site shell script).
 
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
+
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
 `configure' Invocation
 ======================
 
-   `configure' recognizes the following options to control how it
-operates.
+`configure' recognizes the following options to control how it operates.
 
 `--help'
 `-h'

Modified: GNUnet/Makefile.am
===================================================================
--- GNUnet/Makefile.am  2007-09-23 10:31:02 UTC (rev 5655)
+++ GNUnet/Makefile.am  2007-09-24 10:17:22 UTC (rev 5656)
@@ -1,5 +1,5 @@
 INCLUDES = -I$(top_srcdir)/src/include
-SUBDIRS  = m4 po libltdl src doc contrib
+SUBDIRS  = m4 po src doc contrib
 
 EXTRA_DIST = \
  ABOUT-NLS \

Modified: GNUnet/bootstrap
===================================================================
--- GNUnet/bootstrap    2007-09-23 10:31:02 UTC (rev 5655)
+++ GNUnet/bootstrap    2007-09-24 10:17:22 UTC (rev 5656)
@@ -1,27 +1,4 @@
 #!/bin/sh
-export WANT_AUTOMAKE="1.8"
-export MKDIR_P="mkdir -p"
-
-if test "$(which automake-1.8)" != ""; then
-       export AUTOMAKE="automake-1.8"
-elif test "$(which automake)" != ""; then
-       export AUTOMAKE="automake"
-else
-       echo "Error: automake not found"
-       exit
-fi
-
-if test "$(which aclocal-1.8)" != ""; then
-       export ACLOCAL="aclocal-1.8"
-elif test "$(which aclocal)" != ""; then
-       export ACLOCAL="aclocal"
-else
-       echo "Error: aclocal not found"
-       exit
-fi
-
-$AUTOMAKE -fi
-cd libltdl
+aclocal
+automake
 autoreconf -f -i
-cd ..
-autoreconf -f -i

Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2007-09-23 10:31:02 UTC (rev 5655)
+++ GNUnet/configure.ac 2007-09-24 10:17:22 UTC (rev 5656)
@@ -20,10 +20,10 @@
 # Process this file with autoconf to produce a configure script.
 #
 #
-AC_PREREQ(2.57)
+AC_PREREQ(2.61)
 AC_INIT([GNUnet], [0.7.2b],address@hidden)
 AM_INIT_AUTOMAKE([GNUnet], [0.7.2b])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
 
 AH_TOP([#define _GNU_SOURCE  1])
 
@@ -34,20 +34,15 @@
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
-AC_PROG_MKDIR_P
-AC_LIBTOOL_WIN32_DLL
-AC_CANONICAL_HOST
-
-
-# dynamic libraries/plugins
 AC_LIBTOOL_DLOPEN
-AC_LIBLTDL_INSTALLABLE
 AC_SUBST(LTDLINCL)
 AC_SUBST(LIBLTDL)
+AC_SUBST(MKDIR_P)
 AC_DISABLE_STATIC
+AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
+AC_CANONICAL_HOST
 AC_LIB_LTDL
-AC_CONFIG_SUBDIRS(libltdl)
 
 # large file support
 AC_SYS_LARGEFILE
@@ -507,7 +502,7 @@
 AC_CHECK_HEADERS([fcntl.h math.h errno.h limits.h stdio.h locale.h sys/stat.h 
sys/types.h pthread.h],,AC_MSG_ERROR([Compiling GNUnet requires standard UNIX 
headers files]))
 
 # 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([langinfo.h sys/param.h sys/mount.h sys/statvfs.h sys/vfs.h 
arpa/inet.h fcntl.h libintl.h netdb.h netinet/in.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 
iconv.h ifaddrs.h])
+AC_CHECK_HEADERS([langinfo.h sys/param.h sys/mount.h sys/statvfs.h sys/vfs.h 
arpa/inet.h fcntl.h libintl.h netdb.h netinet/in.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 
iconv.h ifaddrs.h mach/mach.h stddef.h sys/timeb.h terminos.h])
 
 # Check for GMP header (and abort if not present)
 AC_CHECK_HEADERS([gmp.h],,AC_MSG_ERROR([Compiling GNUnet requires gmp.h (from 
the GNU MP library, libgmp)]))
@@ -517,7 +512,10 @@
 AC_C_CONST
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
+AC_TYPE_MODE_T
 AC_HEADER_TIME
+AC_HEADER_STAT
+AC_HEADER_STDBOOL
 AC_STRUCT_TM
 
 
@@ -529,6 +527,8 @@
 AC_PROG_GCC_TRADITIONAL
 AC_FUNC_MEMCMP
 AC_FUNC_SELECT_ARGTYPES
+AC_FUNC_CHOWN
+
 AC_TYPE_SIGNAL
 AC_FUNC_STAT
 AC_FUNC_STRFTIME
@@ -536,7 +536,7 @@
 AC_HEADER_SYS_WAIT
 AC_TYPE_OFF_T
 AC_TYPE_UID_T
-AC_CHECK_FUNCS([floor gethostname memmove rmdir strncasecmp strrchr strtol 
atoll dup2 fdatasync ftruncate gethostbyname gettimeofday memset mkdir mkfifo 
select socket strcasecmp strchr strdup strerror strstr clock_gettime getrusage 
rand uname setlocale getcwd mktime gmtime_r gmtime strlcpy strlcat ftruncate 
stat64 sbrk mmap mremap setrlimit gethostbyaddr initgroups getifaddrs 
freeifaddrs getnameinfo])
+AC_CHECK_FUNCS([floor gethostname memmove rmdir strncasecmp strrchr strtol 
atoll dup2 fdatasync ftruncate gethostbyname gettimeofday memset mkdir mkfifo 
select socket strcasecmp strchr strdup strerror strstr clock_gettime getrusage 
rand uname setlocale getcwd mktime gmtime_r gmtime strlcpy strlcat ftruncate 
stat64 sbrk mmap mremap setrlimit gethostbyaddr initgroups getifaddrs 
freeifaddrs getnameinfo inet_ntoa localtime_r nl_langinfo putenv realpath 
strndup])
 
 # restore LIBS
 LIBS=$SAVE_LIBS
@@ -577,14 +577,14 @@
         ;;
       yes)
         AC_CHECK_HEADERS(libguile.h,
-          AC_CHECK_LIB([guile], [scm_sigaction_for_thread],
+          AC_CHECK_LIB([guile], [scm_c_define_gsubr],
             guile=1))
         ;;
       *)
         LDFLAGS="-L$with_guile/lib $LDFLAGS"
         CPPFLAGS="-I$with_guile/include $CPPFLAGS"
         AC_CHECK_HEADERS(libguile.h,
-          AC_CHECK_LIB([guile], [scm_sigaction_for_thread],
+          AC_CHECK_LIB([guile], [scm_c_define_gsubr],
             EXT_LIB_PATH="-L$with_guile/lib $EXT_LIB_PATH"
             guile=1))
         ;;
@@ -592,7 +592,7 @@
    ],
    [AC_MSG_RESULT([--with-guile not specified])
     AC_CHECK_HEADERS(libguile.h,
-     AC_CHECK_LIB([guile], [scm_sigaction_for_thread],
+     AC_CHECK_LIB([guile], [scm_c_define_gsubr],
       guile=1))])
 
 if test "$guile" = 1

Modified: GNUnet/m4/Makefile.am
===================================================================
--- GNUnet/m4/Makefile.am       2007-09-23 10:31:02 UTC (rev 5655)
+++ GNUnet/m4/Makefile.am       2007-09-24 10:17:22 UTC (rev 5656)
@@ -21,8 +21,6 @@
 libxml2.m4\
 longdouble.m4\
 longlong.m4\
-mkdir.m4\
-mkdirp.m4\
 nls.m4\
 pkg.m4\
 po.m4\

Modified: GNUnet/m4/Makefile.in
===================================================================
--- GNUnet/m4/Makefile.in       2007-09-23 10:31:02 UTC (rev 5655)
+++ GNUnet/m4/Makefile.in       2007-09-24 10:17:22 UTC (rev 5656)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,15 +13,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -33,6 +29,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 subdir = m4
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
@@ -42,7 +39,6 @@
        $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
        $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libcurl.m4 \
        $(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkdirp.m4 \
        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
        $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
        $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
@@ -55,8 +51,6 @@
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AS = @AS@
@@ -67,8 +61,6 @@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -76,8 +68,6 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-CYGWIN_FALSE = @CYGWIN_FALSE@
-CYGWIN_TRUE = @CYGWIN_TRUE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -97,31 +87,8 @@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
-HAVE_ADNS_FALSE = @HAVE_ADNS_FALSE@
-HAVE_ADNS_TRUE = @HAVE_ADNS_TRUE@
-HAVE_DIALOG_FALSE = @HAVE_DIALOG_FALSE@
-HAVE_DIALOG_TRUE = @HAVE_DIALOG_TRUE@
-HAVE_GTK_FALSE = @HAVE_GTK_FALSE@
-HAVE_GTK_TRUE = @HAVE_GTK_TRUE@
-HAVE_GUILE_FALSE = @HAVE_GUILE_FALSE@
-HAVE_GUILE_TRUE = @HAVE_GUILE_TRUE@
-HAVE_IPV6_FALSE = @HAVE_IPV6_FALSE@
-HAVE_IPV6_TRUE = @HAVE_IPV6_TRUE@
-HAVE_MHD_FALSE = @HAVE_MHD_FALSE@
-HAVE_MHD_TRUE = @HAVE_MHD_TRUE@
-HAVE_MYSQLE_FALSE = @HAVE_MYSQLE_FALSE@
-HAVE_MYSQLE_TRUE = @HAVE_MYSQLE_TRUE@
-HAVE_MYSQL_FALSE = @HAVE_MYSQL_FALSE@
-HAVE_MYSQL_TRUE = @HAVE_MYSQL_TRUE@
-HAVE_SQLITE_FALSE = @HAVE_SQLITE_FALSE@
-HAVE_SQLITE_TRUE = @HAVE_SQLITE_TRUE@
-HAVE_XML2_FALSE = @HAVE_XML2_FALSE@
-HAVE_XML2_TRUE = @HAVE_XML2_TRUE@
-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -139,18 +106,13 @@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LINUX_FALSE = @LINUX_FALSE@
-LINUX_TRUE = @LINUX_TRUE@
 LN_S = @LN_S@
 LTDLINCL = @LTDLINCL@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
-MACOSX_FALSE = @MACOSX_FALSE@
-MACOSX_TRUE = @MACOSX_TRUE@
 MAKEINFO = @MAKEINFO@
-MINGW_FALSE = @MINGW_FALSE@
-MINGW_TRUE = @MINGW_TRUE@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
@@ -158,8 +120,6 @@
 MYSQL_LDFLAGS = @MYSQL_LDFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OPENBSD_FALSE = @OPENBSD_FALSE@
-OPENBSD_TRUE = @OPENBSD_TRUE@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -172,36 +132,35 @@
 RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
-SOLARIS_FALSE = @SOLARIS_FALSE@
-SOLARIS_TRUE = @SOLARIS_TRUE@
 SQLITE_CPPFLAGS = @SQLITE_CPPFLAGS@
 SQLITE_LDFLAGS = @SQLITE_LDFLAGS@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-XFREEBSD_FALSE = @XFREEBSD_FALSE@
-XFREEBSD_TRUE = @XFREEBSD_TRUE@
 XGETTEXT = @XGETTEXT@
 XML2_CONFIG = @XML2_CONFIG@
 XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 _libcurl_config = @_libcurl_config@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -229,9 +188,11 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-subdirs = @subdirs@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 EXTRA_DIST = glibc2.m4 intl.m4 intldir.m4 lock.m4 visibility.m4 \
 codeset.m4 \
 freetype2.m4\
@@ -255,8 +216,6 @@
 libxml2.m4\
 longdouble.m4\
 longlong.m4\
-mkdir.m4\
-mkdirp.m4\
 nls.m4\
 pkg.m4\
 po.m4\
@@ -309,10 +268,6 @@
 
 clean-libtool:
        -rm -rf .libs _libs
-
-distclean-libtool:
-       -rm -f libtool
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
@@ -321,22 +276,21 @@
 
 
 distdir: $(DISTFILES)
-       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-       list='$(DISTFILES)'; for file in $$list; do \
-         case $$file in \
-           $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-           $(top_srcdir)/*) file=`echo "$$file" | sed 
"s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-         esac; \
+       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+       list='$(DISTFILES)'; \
+         dist_files=`for file in $$list; do echo $$file; done | \
+         sed -e "s|^$$srcdirstrip/||;t" \
+             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+       case $$dist_files in \
+         */*) $(MKDIR_P) `echo "$$dist_files" | \
+                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+                          sort -u` ;; \
+       esac; \
+       for file in $$dist_files; do \
          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-         dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-         if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-           dir="/$$dir"; \
-           $(mkdir_p) "$(distdir)$$dir"; \
-         else \
-           dir=''; \
-         fi; \
          if test -d $$d/$$file; then \
+           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
              cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
            fi; \
@@ -370,7 +324,7 @@
 clean-generic:
 
 distclean-generic:
-       -rm -f $(CONFIG_CLEAN_FILES)
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
@@ -381,7 +335,7 @@
 
 distclean: distclean-am
        -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -395,12 +349,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -419,17 +381,20 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
+.MAKE: install-am install-strip
+
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
        distclean distclean-generic distclean-libtool distdir dvi \
        dvi-am html html-am info info-am install install-am \
-       install-data install-data-am install-exec install-exec-am \
-       install-info install-info-am install-man install-strip \
+       install-data install-data-am install-dvi install-dvi-am \
+       install-exec install-exec-am install-html install-html-am \
+       install-info install-info-am install-man install-pdf \
+       install-pdf-am install-ps install-ps-am install-strip \
        installcheck installcheck-am installdirs maintainer-clean \
        maintainer-clean-generic mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-       uninstall-info-am
+       mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

Deleted: GNUnet/m4/mkdir.m4
===================================================================
--- GNUnet/m4/mkdir.m4  2007-09-23 10:31:02 UTC (rev 5655)
+++ GNUnet/m4/mkdir.m4  2007-09-24 10:17:22 UTC (rev 5656)
@@ -1,73 +0,0 @@
-# AM_PROG_MKDIR_P
-# ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out.  Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
-AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([mkdir_p])])

Deleted: GNUnet/m4/mkdirp.m4
===================================================================
--- GNUnet/m4/mkdirp.m4 2007-09-23 10:31:02 UTC (rev 5655)
+++ GNUnet/m4/mkdirp.m4 2007-09-24 10:17:22 UTC (rev 5656)
@@ -1,63 +0,0 @@
-##                                                          -*- Autoconf -*-
-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AC_PROG_MKDIR_P
-# ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out.  Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
-AC_DEFUN([AC_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([mkdir_p])])

Modified: GNUnet/src/applications/advertising/Makefile.am
===================================================================
--- GNUnet/src/applications/advertising/Makefile.am     2007-09-23 10:31:02 UTC 
(rev 5655)
+++ GNUnet/src/applications/advertising/Makefile.am     2007-09-24 10:17:22 UTC 
(rev 5656)
@@ -16,31 +16,46 @@
 libgnunetmodule_advertising_la_LDFLAGS = \
   -export-dynamic -avoid-version -module
 
+
+
+if HAVE_MHD
+  httptest = advertisingtest_http 
+endif
+
 check_PROGRAMS = \
-  advertising_test \
-  advertising_test_udp 
+  advertisingtest_tcp \
+  advertisingtest_udp $(httptest) 
 
 TESTS = $(check_PROGRAMS)
 
-advertising_test_SOURCES = \
+advertisingtest_tcp_SOURCES = \
   advertising_test.c 
-advertising_test_LDADD = \
+advertisingtest_tcp_LDADD = \
   $(top_builddir)/src/applications/stats/libgnunetstats_api.la \
   $(top_builddir)/src/util/network_client/libgnunetutil_network_client.la \
   $(top_builddir)/src/applications/testing/libgnunettesting_api.la \
   $(top_builddir)/src/util/config_impl/libgnunetutil_config.la \
   $(top_builddir)/src/util/libgnunetutil.la 
 
-advertising_test_udp_SOURCES = \
+advertisingtest_udp_SOURCES = \
   advertising_test.c 
-advertising_test_udp_LDADD = \
+advertisingtest_udp_LDADD = \
   $(top_builddir)/src/applications/stats/libgnunetstats_api.la \
   $(top_builddir)/src/util/network_client/libgnunetutil_network_client.la \
   $(top_builddir)/src/applications/testing/libgnunettesting_api.la \
   $(top_builddir)/src/util/config_impl/libgnunetutil_config.la \
   $(top_builddir)/src/util/libgnunetutil.la 
 
+advertisingtest_http_SOURCES = \
+  advertising_test.c 
+advertisingtest_http_LDADD = \
+  $(top_builddir)/src/applications/stats/libgnunetstats_api.la \
+  $(top_builddir)/src/util/network_client/libgnunetutil_network_client.la \
+  $(top_builddir)/src/applications/testing/libgnunettesting_api.la \
+  $(top_builddir)/src/util/config_impl/libgnunetutil_config.la \
+  $(top_builddir)/src/util/libgnunetutil.la 
 
 
+
 EXTRA_DIST = \
   check.conf 

Modified: GNUnet/src/applications/advertising/advertising_test.c
===================================================================
--- GNUnet/src/applications/advertising/advertising_test.c      2007-09-23 
10:31:02 UTC (rev 5655)
+++ GNUnet/src/applications/advertising/advertising_test.c      2007-09-24 
10:17:22 UTC (rev 5656)
@@ -82,7 +82,7 @@
     }
   peers =
     gnunet_testing_start_daemons (NULL ==
-                                  strstr (argv[0], "_udp") ? "tcp" : "udp",
+                                  strstr (argv[0], "_") + 1,
                                   "advertising stats",
                                   "/tmp/gnunet-advertising-test", 2087, 10,
                                   NUM_PEERS);

Modified: GNUnet/src/applications/session/Makefile.am
===================================================================
--- GNUnet/src/applications/session/Makefile.am 2007-09-23 10:31:02 UTC (rev 
5655)
+++ GNUnet/src/applications/session/Makefile.am 2007-09-24 10:17:22 UTC (rev 
5656)
@@ -14,7 +14,7 @@
   -export-dynamic -avoid-version -module
 
 if HAVE_MHD
-  httptest = sessiontest_http
+  httptest = sessiontest_http sessiontest2_http
 endif
 
 check_PROGRAMS = \
@@ -42,6 +42,15 @@
   $(top_builddir)/src/util/network_client/libgnunetutil_network_client.la  \
   $(top_builddir)/src/util/libgnunetutil.la 
 
+sessiontest_http_SOURCES = \
+  sessiontest.c 
+sessiontest_http_LDADD = \
+  $(top_builddir)/src/applications/stats/libgnunetstats_api.la \
+  $(top_builddir)/src/applications/testing/libgnunettesting_api.la \
+  $(top_builddir)/src/util/config_impl/libgnunetutil_config.la  \
+  $(top_builddir)/src/util/network_client/libgnunetutil_network_client.la  \
+  $(top_builddir)/src/util/libgnunetutil.la 
+
 sessiontest2_SOURCES = \
   sessiontest2.c 
 sessiontest2_LDADD = \
@@ -52,9 +61,9 @@
   $(top_builddir)/src/util/libgnunetutil.la 
 
 
-sessiontest_http_SOURCES = \
+sessiontest2_http_SOURCES = \
   sessiontest_http.c 
-sessiontest_http_LDADD = \
+sessiontest2_http_LDADD = \
   $(top_builddir)/src/applications/stats/libgnunetstats_api.la \
   $(top_builddir)/src/applications/identity/libgnunetidentity_api.la \
   $(top_builddir)/src/util/config_impl/libgnunetutil_config.la  \

Modified: GNUnet/src/applications/session/http-peer.conf
===================================================================
--- GNUnet/src/applications/session/http-peer.conf      2007-09-23 10:31:02 UTC 
(rev 5655)
+++ GNUnet/src/applications/session/http-peer.conf      2007-09-24 10:17:22 UTC 
(rev 5656)
@@ -34,5 +34,4 @@
 
 [HTTP]
 PORT = 1080
-UPNP = NO
 

Modified: GNUnet/src/applications/session/nat-http-peer.conf
===================================================================
--- GNUnet/src/applications/session/nat-http-peer.conf  2007-09-23 10:31:02 UTC 
(rev 5655)
+++ GNUnet/src/applications/session/nat-http-peer.conf  2007-09-24 10:17:22 UTC 
(rev 5656)
@@ -16,7 +16,6 @@
 ADMIN-LEVEL = ERROR
 
 [MODULES]
-sqstore = "sqstore_sqlite"
 topology = "topology_default"
 
 [NETWORK]

Modified: GNUnet/src/applications/session/sessiontest.c
===================================================================
--- GNUnet/src/applications/session/sessiontest.c       2007-09-23 10:31:02 UTC 
(rev 5655)
+++ GNUnet/src/applications/session/sessiontest.c       2007-09-24 10:17:22 UTC 
(rev 5656)
@@ -75,7 +75,7 @@
 #if START_PEERS
   peers =
     gnunet_testing_start_daemons (NULL ==
-                                  strstr (argv[0], "_udp") ? "tcp" : "udp",
+                                  strstr (argv[0], "_") + 1, /* tcp, udp or 
http */
                                   "advertising stats",
                                   "/tmp/gnunet-session-test", 2087, 10000, 2);
   if (peers == NULL)

Modified: GNUnet/src/applications/tbench/Makefile.am
===================================================================
--- GNUnet/src/applications/tbench/Makefile.am  2007-09-23 10:31:02 UTC (rev 
5655)
+++ GNUnet/src/applications/tbench/Makefile.am  2007-09-24 10:17:22 UTC (rev 
5656)
@@ -10,9 +10,11 @@
 
 bin_PROGRAMS = \
   gnunet-tbench
+
 plugin_LTLIBRARIES = \
   libgnunetmodule_tbench.la
 
+
 gnunet_tbench_SOURCES = \
   gnunet-tbench.c \
   tbench.h
@@ -30,16 +32,19 @@
   -export-dynamic -avoid-version -module
 
 
+if HAVE_MHD
+  httptest = tbenchtest_http 
+endif
 
 check_PROGRAMS = \
-  tbenchtest \
-  tbenchtest_udp
+  tbenchtest_tcp \
+  tbenchtest_udp $(httptest)
 
 TESTS = $(check_PROGRAMS)
 
-tbenchtest_SOURCES = \
+tbenchtest_tcp_SOURCES = \
   tbenchtest.c 
-tbenchtest_LDADD = \
+tbenchtest_tcp_LDADD = \
   $(top_builddir)/src/applications/stats/libgnunetstats_api.la \
   $(top_builddir)/src/applications/testing/libgnunettesting_api.la \
   $(top_builddir)/src/util/network_client/libgnunetutil_network_client.la \
@@ -59,5 +64,16 @@
   $(top_builddir)/src/util/config_impl/libgnunetutil_config.la \
   $(top_builddir)/src/util/libgnunetutil.la 
 
+tbenchtest_http_SOURCES = \
+  tbenchtest.c 
+tbenchtest_http_LDADD = \
+  $(top_builddir)/src/applications/stats/libgnunetstats_api.la \
+  $(top_builddir)/src/applications/testing/libgnunettesting_api.la \
+  $(top_builddir)/src/util/network_client/libgnunetutil_network_client.la \
+  $(top_builddir)/src/util/loggers/libgnunetutil_logging.la \
+  $(top_builddir)/src/util/crypto/libgnunetutil_crypto.la \
+  $(top_builddir)/src/util/config_impl/libgnunetutil_config.la \
+  $(top_builddir)/src/util/libgnunetutil.la 
+
 EXTRA_DIST = \
   check.conf 

Modified: GNUnet/src/applications/tbench/tbenchtest.c
===================================================================
--- GNUnet/src/applications/tbench/tbenchtest.c 2007-09-23 10:31:02 UTC (rev 
5655)
+++ GNUnet/src/applications/tbench/tbenchtest.c 2007-09-24 10:17:22 UTC (rev 
5656)
@@ -129,7 +129,7 @@
 #if START_PEERS
   peers =
     gnunet_testing_start_daemons (NULL ==
-                                  strstr (argv[0], "_udp") ? "tcp" : "udp",
+                                  strstr (argv[0], "_") + 1,
                                   "advertising tbench topology stats",
                                   "/tmp/gnunet-tbench-test", 2087, 10000, 2);
   if (peers == NULL)

Modified: GNUnet/src/util/os/statuscallstest.c
===================================================================
--- GNUnet/src/util/os/statuscallstest.c        2007-09-23 10:31:02 UTC (rev 
5655)
+++ GNUnet/src/util/os/statuscallstest.c        2007-09-24 10:17:22 UTC (rev 
5656)
@@ -30,6 +30,7 @@
 int
 main (int argc, char *argv[])
 {
+  static long k;
   int ret;
   cron_t start;
   struct GE_Context *ectx;
@@ -51,7 +52,7 @@
   start = get_time ();
   ret = os_cpu_get_load (ectx, cfg);
   while (start + 60 * cronSECONDS > get_time ())
-    sqrt (245.2523);            /* do some processing to drive load up */
+    k++;            /* do some processing to drive load up */
   if (ret > os_cpu_get_load (ectx, cfg))
     {
       printf ("busy loop decreased CPU load: %d < %d.\n",

Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2007-09-23 10:31:02 UTC (rev 5655)
+++ GNUnet/todo 2007-09-24 10:17:22 UTC (rev 5656)
@@ -4,11 +4,9 @@
   RC == Release Critical
 
 0.7.3 [8'07] (aka "features"):
+- http transport needs more testing (still not 100% sure it is working)
+- fix strange crash-bug(s) in gnunetd and gnunet-setup
 - chat support basics [RC]
-- old/new features:
-  * SMTP transport (libesmtp)
-- Documentation:
-  * LJ article
 - Testcases:
   * more XFS/DHT
   * tracekit
@@ -25,6 +23,8 @@
   gnunet-insert only if the file is actually needed!)
 - guard friendly connection count (#1018) [RC]
 - power insert [#854]
+- old/new features:
+  * SMTP transport (libesmtp)
 
 1.0.0 (aka "userfriendly"):
 - implement testbed for profiling





reply via email to

[Prev in Thread] Current Thread [Next in Thread]