[GNUnet-SVN] r3047 - in GNUnet/src: include util/cron util/getopt util/network util/string

[grothoff]

Author: grothoff
Date: 2006-06-24 18:49:25 -0700 (Sat, 24 Jun 2006)
New Revision: 3047

Modified:
   GNUnet/src/include/gnunet_core.h
   GNUnet/src/include/gnunet_util.h
   GNUnet/src/include/gnunet_util_cron.h
   GNUnet/src/include/gnunet_util_network.h
   GNUnet/src/util/cron/cron.c
   GNUnet/src/util/getopt/Makefile
   GNUnet/src/util/network/tcpio.c
   GNUnet/src/util/string/Makefile
Log:
API fixes

Modified: GNUnet/src/include/gnunet_core.h
===================================================================
--- GNUnet/src/include/gnunet_core.h    2006-06-25 01:43:44 UTC (rev 3046)
+++ GNUnet/src/include/gnunet_core.h    2006-06-25 01:49:25 UTC (rev 3047)
@@ -57,6 +57,11 @@
 #define EXTREME_PRIORITY 0xFFFFFF
 
 /**
+ * Highest legal priority or trust value
+ */
+#define MAX_PRIO 0x7FFFFFFF
+
+/**
  * Overhead of the core for encapsulating P2P messages.
  * Should be subtracted from the transport MTU to compute
  * the amount of space available for an unfragmented

Modified: GNUnet/src/include/gnunet_util.h
===================================================================
--- GNUnet/src/include/gnunet_util.h    2006-06-25 01:43:44 UTC (rev 3046)
+++ GNUnet/src/include/gnunet_util.h    2006-06-25 01:49:25 UTC (rev 3047)
@@ -27,27 +27,17 @@
  * @author Gerd Knorr <address@hidden>
  * @author Ioana Patrascu
  * @author Tzvetan Horozov
- *
- * Features:
- * - threading (semaphore, pthreads, cron)
- * - basic libc wrappers (malloc, strdup, iconv)
- * - disk io (filesize, read, write, copy, remove, scan directory)
- * - network io (client socket, read, write, nonblocking, etc.)
- * - process management
- * - lots of other small functions
- * ??: sort/regroup ?? 
  */
 
 #ifndef GNUNET_UTIL_H
 #define GNUNET_UTIL_H
 
 #ifdef MINGW
-  #include <windows.h>
-  #include <iphlpapi.h>
-  #include <Ntsecapi.h>
-  #include <lm.h>
-  
-  #define HAVE_STAT64 1
+#include <windows.h>
+#include <iphlpapi.h>
+#include <Ntsecapi.h>
+#include <lm.h>
+#define HAVE_STAT64 1
 #endif
 
 /* we need size_t, and since it can be both unsigned int
@@ -73,7 +63,6 @@
 #endif
 #endif
 
-
 #define DEFAULT_CLIENT_CONFIG_FILE "~/.gnunet/gnunet.conf"
 #define DEFAULT_DAEMON_DIR         "/etc"
 #define DEFAULT_DAEMON_CONFIG_FILE DEFAULT_DAEMON_DIR"/gnunetd.conf"
@@ -83,9 +72,6 @@
 #define GNUNET_HOME_DIRECTORY      "~/.gnunet"
 #define HOME_DAEMON_CONFIG_FILE    GNUNET_HOME_DIRECTORY"/gnunetd.conf"
 
-
-/* **************** constants ****************** */
-
 /**
  * Just the version number of GNUnet-util implementation.
  * Encoded as
@@ -98,19 +84,15 @@
  * especially the least significant bits may change
  * frequently, even between different SVN versions.
  */
-#define GNUNET_UTIL_VERSION 0x00070004
+#define GNUNET_UTIL_VERSION 0x00070100
 
 /* CHRISTIAN: move this to gnunet_core.h or _protocols.h ? */
 
-/**
- * Highest legal priority or trust value
- */
-#define MAX_PRIO 0x7FFFFFFF
-
-
 /* NILS: I would love to see the 
    next two methods in PLIBC */
 
+typedef unsigned int TIME_T;
+
 /**
  * TIME prototype. "man time".
  */
@@ -133,6 +115,11 @@
                  int dwErr);
 
 
+/* FIXME: these functions need to be replaced with
+   functions that are appropriate for bootstrapping
+   the new gnunetutil library (i.e. setup error,
+   parse command line, setup configuration, etc.) */
+
 /**
  * Initialize the util module.
  * @param argc the number of arguments
@@ -141,8 +128,7 @@
  * @return OK on success, SYSERR if we should abort
  */
 int initUtil(int argc,
-            char * argv[],
-            CommandLineParser parser);
+            char * argv[]);
 
 
 /**
@@ -157,7 +143,6 @@
 }
 #endif
 
-
 /* ifndef GNUNET_UTIL_H */
 #endif
 /* end of gnunet_util.h */

Modified: GNUnet/src/include/gnunet_util_cron.h
===================================================================
--- GNUnet/src/include/gnunet_util_cron.h       2006-06-25 01:43:44 UTC (rev 
3046)
+++ GNUnet/src/include/gnunet_util_cron.h       2006-06-25 01:49:25 UTC (rev 
3047)
@@ -37,21 +37,23 @@
 #endif
 #endif
 
+#include "gnunet_util.h"
+
 /**
  * Type of a cron-job method.
  */
 typedef void (*CronJob)(void *);
 
-/**
- * Start the cron jobs.
- */
-void cron_start_jobs(void);
+struct CronManager;
 
-/**
- * Stop the cron service.
- */
-void cron_stop_jobs(void);
+struct CronManager * cron_create(struct GE_Context * ectx);
 
+void cron_destroy(struct CronManager * mgr);
+
+void cron_start(struct CronManager * mgr);
+
+void cron_stop(struct CronManager * mgr);
+
 /**
  * Stop running cron-jobs for a short time.  This method may only be
  * called by a thread that is not holding any locks.  It will cause
@@ -61,7 +63,8 @@
  *
  * @param checkself, if YES and this thread is the cron thread, do nothing
  */
-void cron_suspend_jobs(int checkself);
+void cron_suspend(struct CronManager * mgr,
+                 int checkself);
 
 /**
  * Resume running cron-jobs.  Call must be matched by
@@ -70,12 +73,13 @@
  *
  * @param checkself, if YES and this thread is the cron thread, do nothing
  */
-void cron_resume_jobs(int checkself);
+void cron_resume_jobs(struct CronManager * mgr,
+                     int checkself);
 
 /**
  * Is the cron-thread currently running?
  */
-int cron_test_running(void);
+int cron_test_running(struct CronManager * mgr);
 
 /**
  * Add a cron-job to the delta list.
@@ -85,7 +89,8 @@
  *        the runs, otherwise 0.
  * @param data argument to pass to the method
  */
-void cron_add_job(CronJob method,
+void cron_add_job(struct CronManager * mgr,
+                 CronJob method,
                  unsigned int delta,
                  unsigned int deltaRepeat,
                  void * data);
@@ -102,7 +107,8 @@
  *        non-null and cron is shutdown before the job is
  *        run and/or delCronJob is called
  */
-void cron_advance_job(CronJob method,
+void cron_advance_job(struct CronManager * mgr,
+                     CronJob method,
                      unsigned int deltaRepeat,
                      void * data);
 
@@ -119,7 +125,8 @@
  * @param data what was the data given to the method
  * @return the number of jobs removed
  */
-int cron_del_job(CronJob method,
+int cron_del_job(struct CronManager * mgr,
+                CronJob method,
                 unsigned int repeat,
                 void * data);
 

Modified: GNUnet/src/include/gnunet_util_network.h
===================================================================
--- GNUnet/src/include/gnunet_util_network.h    2006-06-25 01:43:44 UTC (rev 
3046)
+++ GNUnet/src/include/gnunet_util_network.h    2006-06-25 01:49:25 UTC (rev 
3047)
@@ -214,7 +214,10 @@
 int check_ipv6_listed(const struct CIDR6Network * list,
                      IP6addr ip);
 
-#define PRIP(ip) (unsigned int)(((unsigned int)(ip))>>24), (unsigned 
int)((((unsigned)(ip)))>>16 & 255), (unsigned int)((((unsigned int)(ip)))>>8 & 
255), (unsigned int)((((unsigned int)(ip))) & 255)
+#define PRIP(ip) (unsigned int)(((unsigned int)(ip))>>24), \
+                 (unsigned int)((((unsigned)(ip)))>>16 & 255), \
+                 (unsigned int)((((unsigned int)(ip)))>>8 & 255), \
+                 (unsigned int)((((unsigned int)(ip))) & 255)
 
 /**
  * Get the IP address of the given host.

Modified: GNUnet/src/util/cron/cron.c
===================================================================
--- GNUnet/src/util/cron/cron.c 2006-06-25 01:43:44 UTC (rev 3046)
+++ GNUnet/src/util/cron/cron.c 2006-06-25 01:49:25 UTC (rev 3047)
@@ -34,7 +34,7 @@
  * then run the actual job.
  */
 
-#include "gnunet_util.h"
+#include "gnunet_util_cron.h"
 #include "platform.h"
 
 #define DEBUG_CRON NO
@@ -61,88 +61,112 @@
 
 #define CHECK_ASSERTS 1
 
+/* change this value to artificially speed up all
+   GNUnet cron timers by this factor. E.g. with 10,
+   a cron-job scheduled after 1 minute in the code
+   will occur after 6 seconds. This is useful for
+   testing bugs that would otherwise occur only after
+   a long time.
+
+   For releases, this value should always be 1 */
+#define SPEED_UP 1
+
+/** number of cron units (ms) in a second */
+#define CRON_UNIT_TO_SECONDS (1000 / SPEED_UP)
+
+/** number of us [usec] in a cron-unit (1000) */
+#define MICROSEC_TO_CRON_UNIT (1000 * SPEED_UP)
+
+
 /**
- * The Delta-list for the cron jobs.
+ * @brief The Delta-list for the cron jobs.
  */
 typedef struct {
-  /** The start-time for this event (in milliseconds). */
+
+  /**
+   * The method to call at that point. 
+   */
+  CronJob method;
+
+  /**
+   * data ptr (argument to the method) 
+   */
+  void * data;
+
+  /**
+   * The start-time for this event (in milliseconds). 
+   */
   cron_t delta;
-  /** The method to call at that point. */
-  CronJob method;
-  /** for cron-jobs: when this should be repeated
-      automatically, 0 if this was a once-only job */
+
+  /**
+   * for cron-jobs: when this should be repeated
+   * automatically, 0 if this was a once-only job 
+   */
   unsigned int deltaRepeat;
-  /** The index of the next entry in the delta list
-      after this one */
+
+  /**
+   * The index of the next entry in the delta list
+   * after this one (-1 for none)
+   */
   int next;
-  /** data ptr (argument to the method) */
-  void * data;
+
 } UTIL_cron_DeltaListEntry;
 
-/**
- * The delta-list of waiting tasks.
- */
-static UTIL_cron_DeltaListEntry * deltaList_;
+typedef struct CronManager {
 
-/**
- * The current size of the DeltaList.
- */
-static unsigned int deltaListSize_;
+  /**
+   * The lock for the delta-list.
+   */
+  struct MUTEX * deltaListLock_;
 
-/**
- * The lock for the delta-list.
- */
-static Mutex deltaListLock_;
+  /**
+   * The delta-list of waiting tasks.
+   */
+  UTIL_cron_DeltaListEntry * deltaList_;
 
-/**
- * The currently running job.
- */
-static CronJob runningJob_;
-static unsigned int runningRepeat_;
-static void * runningData_;
+  /**
+   * The currently running job.
+   */
+  CronJob runningJob_;
 
-/**
- * The first empty slot in the delta-list.
- */
-static int firstFree_;
+  void * runningData_;
 
-/**
- * The first empty slot in the delta-list.
- */
-static int firstUsed_;
+  /**
+   * The cron thread.
+   */
+  struct PTHREAD * cron_handle;
 
-/**
- * The cron thread.
- */
-static int cron_shutdown = YES;
-static Semaphore * cron_signal = NULL;
-static Semaphore * cron_signal_up = NULL;
+  struct SEMAPHORE * cron_signal;
 
-static PTHREAD_T cron_handle;
+  struct SEMAPHORE * cron_signal_up;
 
+  struct MUTEX * inBlockLock_;
 
-static Mutex inBlockLock_;
+  unsigned int runningRepeat_;
 
+  /**
+   * The current size of the DeltaList.
+   */
+  unsigned int deltaListSize_;
 
-/* change this value to artificially speed up all
-   GNUnet cron timers by this factor. E.g. with 10,
-   a cron-job scheduled after 1 minute in the code
-   will occur after 6 seconds. This is useful for
-   testing bugs that would otherwise occur only after
-   a long time.
+  /**
+   * The first empty slot in the delta-list.
+   */
+  int firstFree_;
 
-   For releases, this value should always be 1 */
-#define SPEED_UP 1
+  /**
+   * The first empty slot in the delta-list.
+   */
+  int firstUsed_;
 
-/** number of cron units (ms) in a second */
-#define CRON_UNIT_TO_SECONDS (1000 / SPEED_UP)
+  /**
+   * Set to yes if we are shutting down or shut down.
+   */ 
+  int cron_shutdown;
 
-/** number of us [usec] in a cron-unit (1000) */
-#define MICROSEC_TO_CRON_UNIT (1000 * SPEED_UP)
+} CronManager;
 
 
-
-
 /**
  * Initialize the cron service.
  */

Modified: GNUnet/src/util/getopt/Makefile
===================================================================
--- GNUnet/src/util/getopt/Makefile     2006-06-25 01:43:44 UTC (rev 3046)
+++ GNUnet/src/util/getopt/Makefile     2006-06-25 01:49:25 UTC (rev 3047)
@@ -101,7 +101,7 @@
 CONVENIENCE_LTDL_FALSE = 
 CONVENIENCE_LTDL_TRUE = #
 CPP = gcc -E
-CPPFLAGS = -I/home/grothoff/include 
+CPPFLAGS = -I/home/grothoff//include 
 CXX = g++
 CXXCPP = g++ -E
 CXXDEPMODE = depmode=gcc3
@@ -109,7 +109,7 @@
 CYGPATH_W = echo
 CYGWIN_FALSE = 
 CYGWIN_TRUE = #
-DATADIR = /home/grothoff/share/GNUnet/
+DATADIR = /home/grothoff//share/GNUnet/
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
 DLLTOOL = dlltool
@@ -120,27 +120,27 @@
 EGREP = grep -E
 EXEEXT = 
 EXT_LIBS = 
-EXT_LIB_PATH = -L/home/grothoff/lib 
-F77 = 
-FFLAGS = 
+EXT_LIB_PATH = -L/home/grothoff//lib 
+F77 = f77
+FFLAGS = -g -O2
 GMSGFMT = /usr/bin/msgfmt
-GNUNETGTK_CFLAGS = -DXTHREADS -I/usr/include/libglade-2.0 
-I/usr/include/gtk-2.0 -I/usr/include/libxml2 -I/usr/lib/gtk-2.0/include 
-I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 
-I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
-GNUNETGTK_LIBS = -lglade-2.0 -lgtk-x11-2.0 -lxml2 -lpthread -lz -lgdk-x11-2.0 
-latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 
-lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
-GTK_CFLAGS = -DXTHREADS -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include 
-I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 
-I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
-GTK_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm 
-lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl 
-lglib-2.0  
-GUILE = /usr/bin/guile
-GUILE_CONFIG = /usr/bin/guile-config
-GUILE_TOOLS = /usr/bin/guile-tools
+GNUNETGTK_CFLAGS = -I/usr/include/libglade-2.0 -I/usr/include/gtk-2.0 
-I/usr/include/libxml2 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 
-I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 
-I/usr/lib/glib-2.0/include  
+GNUNETGTK_LIBS = -lglade-2.0 -lgtk-x11-2.0 -lxml2 -lz -lgdk-x11-2.0 -latk-1.0 
-lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lfontconfig -lXext -lXrender -lXinerama 
-lXi -lXrandr -lXcursor -lXfixes -lpango-1.0 -lcairo -lX11 -lgobject-2.0 
-lgmodule-2.0 -ldl -lglib-2.0  
+GTK_CFLAGS = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include 
-I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 
-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GTK_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm 
-lpangocairo-1.0 -lfontconfig -lXext -lXrender -lXinerama -lXi -lXrandr 
-lXcursor -lXfixes -lpango-1.0 -lcairo -lX11 -lgobject-2.0 -lgmodule-2.0 -ldl 
-lglib-2.0  
+GUILE = 
+GUILE_CONFIG = 
+GUILE_TOOLS = 
 HAVE_CURSES_FALSE = #
 HAVE_CURSES_TRUE = 
 HAVE_GTK_FALSE = #
 HAVE_GTK_TRUE = 
-HAVE_GUILE_FALSE = #
-HAVE_GUILE_TRUE = 
+HAVE_GUILE_FALSE = 
+HAVE_GUILE_TRUE = #
 HAVE_IPV6_FALSE = #
 HAVE_IPV6_TRUE = 
-HAVE_MYSQL_FALSE = 
-HAVE_MYSQL_TRUE = #
+HAVE_MYSQL_FALSE = #
+HAVE_MYSQL_TRUE = 
 HAVE_PDCURSES_FALSE = 
 HAVE_PDCURSES_TRUE = #
 HAVE_SQLITE_FALSE = #
@@ -154,7 +154,7 @@
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
 INTLLIBS = 
-LDFLAGS = -L/home/grothoff/lib 
+LDFLAGS = -L/home/grothoff//lib 
 LIBADD_DL = -ldl
 LIBGCRYPT_CFLAGS =   
 LIBGCRYPT_CONFIG = /usr/bin/libgcrypt-config
@@ -166,7 +166,7 @@
 LIBS = -lm -lnsl -lpthread 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LN_S = ln -s
-LOCALEDIR = /home/grothoff/share/locale/
+LOCALEDIR = /home/grothoff//share/locale/
 LTDLINCL = 
 LTLIBICONV = -liconv
 LTLIBINTL = 
@@ -208,7 +208,7 @@
 ac_ct_CC = gcc
 ac_ct_CXX = g++
 ac_ct_DLLTOOL = 
-ac_ct_F77 = 
+ac_ct_F77 = f77
 ac_ct_OBJDUMP = 
 ac_ct_RANLIB = ranlib
 ac_ct_STRIP = strip
@@ -227,7 +227,7 @@
 build_vendor = pc
 datadir = ${prefix}/share
 exec_prefix = ${prefix}
-guile_available = /usr/bin/guile
+guile_available = 
 host = i686-pc-linux-gnu
 host_alias = 
 host_cpu = i686
@@ -242,7 +242,7 @@
 mandir = ${prefix}/man
 mkdir_p = mkdir -p -- .
 oldincludedir = /usr/include
-prefix = /home/grothoff
+prefix = /home/grothoff/
 program_transform_name = s,x,x,
 sbindir = ${exec_prefix}/sbin
 sharedstatedir = ${prefix}/com

Modified: GNUnet/src/util/network/tcpio.c
===================================================================
--- GNUnet/src/util/network/tcpio.c     2006-06-25 01:43:44 UTC (rev 3046)
+++ GNUnet/src/util/network/tcpio.c     2006-06-25 01:49:25 UTC (rev 3047)
@@ -37,7 +37,9 @@
  * provided in transports/tcp.c.
  */
 
-#include "gnunet_util.h"
+#include "gnunet_util_network.h"
+#include "gnunet_util_os.h"
+#include "gnunet_util_config.h"
 #include "platform.h"
 
 #define DEBUG_TCPIO NO
@@ -51,38 +53,28 @@
 typedef struct GNUNET_TCP_SOCKET {
 
   /**
-   * the socket handle, -1 if invalid / not life
+   * the socket handle, NULL if not life
    */
   struct SocketHandle * socket;
 
-  /**
-   * the following is the IP for the remote host for client-sockets,
-   * as returned by gethostbyname("hostname"); server sockets should
-   * use 0.
-   */
-  IPaddr ip;
-
-  /**
-   * the port number, in host byte order
-   */
-  unsigned short port;
-
-  /**
-   * Write buffer length for non-blocking writes.
-   */
-  unsigned int outBufLen;
-
-  /**
-   * Write buffer for non-blocking writes.
-   */
-  void * outBufPending;
-
   struct Mutex * readlock;
 
   struct Mutex * writelock;
 
   struct CE_Context * ectx;
 
+  struct GC_Configuration * cfg;
+
+  /**
+   * If this is gnunetd's server socket, then we cannot
+   * automatically reconnect after closing the connection
+   * (since it is an "accept" that gives the socket).<p>
+   *
+   * If this is NO, we should query the configuration and
+   * automagically try to reconnect.
+   */
+  int isServerSocket;
+
 } GNUNET_TCP_SOCKET;
 
 

Modified: GNUnet/src/util/string/Makefile
===================================================================
--- GNUnet/src/util/string/Makefile     2006-06-25 01:43:44 UTC (rev 3046)
+++ GNUnet/src/util/string/Makefile     2006-06-25 01:49:25 UTC (rev 3047)
@@ -103,7 +103,7 @@
 CONVENIENCE_LTDL_FALSE = 
 CONVENIENCE_LTDL_TRUE = #
 CPP = gcc -E
-CPPFLAGS = -I/home/grothoff/include 
+CPPFLAGS = -I/home/grothoff//include 
 CXX = g++
 CXXCPP = g++ -E
 CXXDEPMODE = depmode=gcc3
@@ -111,7 +111,7 @@
 CYGPATH_W = echo
 CYGWIN_FALSE = 
 CYGWIN_TRUE = #
-DATADIR = /home/grothoff/share/GNUnet/
+DATADIR = /home/grothoff//share/GNUnet/
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
 DLLTOOL = dlltool
@@ -122,27 +122,27 @@
 EGREP = grep -E
 EXEEXT = 
 EXT_LIBS = 
-EXT_LIB_PATH = -L/home/grothoff/lib 
-F77 = 
-FFLAGS = 
+EXT_LIB_PATH = -L/home/grothoff//lib 
+F77 = f77
+FFLAGS = -g -O2
 GMSGFMT = /usr/bin/msgfmt
-GNUNETGTK_CFLAGS = -DXTHREADS -I/usr/include/libglade-2.0 
-I/usr/include/gtk-2.0 -I/usr/include/libxml2 -I/usr/lib/gtk-2.0/include 
-I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 
-I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
-GNUNETGTK_LIBS = -lglade-2.0 -lgtk-x11-2.0 -lxml2 -lpthread -lz -lgdk-x11-2.0 
-latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 
-lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
-GTK_CFLAGS = -DXTHREADS -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include 
-I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 
-I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
-GTK_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm 
-lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl 
-lglib-2.0  
-GUILE = /usr/bin/guile
-GUILE_CONFIG = /usr/bin/guile-config
-GUILE_TOOLS = /usr/bin/guile-tools
+GNUNETGTK_CFLAGS = -I/usr/include/libglade-2.0 -I/usr/include/gtk-2.0 
-I/usr/include/libxml2 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 
-I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 
-I/usr/lib/glib-2.0/include  
+GNUNETGTK_LIBS = -lglade-2.0 -lgtk-x11-2.0 -lxml2 -lz -lgdk-x11-2.0 -latk-1.0 
-lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lfontconfig -lXext -lXrender -lXinerama 
-lXi -lXrandr -lXcursor -lXfixes -lpango-1.0 -lcairo -lX11 -lgobject-2.0 
-lgmodule-2.0 -ldl -lglib-2.0  
+GTK_CFLAGS = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include 
-I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 
-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GTK_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm 
-lpangocairo-1.0 -lfontconfig -lXext -lXrender -lXinerama -lXi -lXrandr 
-lXcursor -lXfixes -lpango-1.0 -lcairo -lX11 -lgobject-2.0 -lgmodule-2.0 -ldl 
-lglib-2.0  
+GUILE = 
+GUILE_CONFIG = 
+GUILE_TOOLS = 
 HAVE_CURSES_FALSE = #
 HAVE_CURSES_TRUE = 
 HAVE_GTK_FALSE = #
 HAVE_GTK_TRUE = 
-HAVE_GUILE_FALSE = #
-HAVE_GUILE_TRUE = 
+HAVE_GUILE_FALSE = 
+HAVE_GUILE_TRUE = #
 HAVE_IPV6_FALSE = #
 HAVE_IPV6_TRUE = 
-HAVE_MYSQL_FALSE = 
-HAVE_MYSQL_TRUE = #
+HAVE_MYSQL_FALSE = #
+HAVE_MYSQL_TRUE = 
 HAVE_PDCURSES_FALSE = 
 HAVE_PDCURSES_TRUE = #
 HAVE_SQLITE_FALSE = #
@@ -156,7 +156,7 @@
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
 INTLLIBS = 
-LDFLAGS = -L/home/grothoff/lib 
+LDFLAGS = -L/home/grothoff//lib 
 LIBADD_DL = -ldl
 LIBGCRYPT_CFLAGS =   
 LIBGCRYPT_CONFIG = /usr/bin/libgcrypt-config
@@ -168,7 +168,7 @@
 LIBS = -lm -lnsl -lpthread 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LN_S = ln -s
-LOCALEDIR = /home/grothoff/share/locale/
+LOCALEDIR = /home/grothoff//share/locale/
 LTDLINCL = 
 LTLIBICONV = -liconv
 LTLIBINTL = 
@@ -210,7 +210,7 @@
 ac_ct_CC = gcc
 ac_ct_CXX = g++
 ac_ct_DLLTOOL = 
-ac_ct_F77 = 
+ac_ct_F77 = f77
 ac_ct_OBJDUMP = 
 ac_ct_RANLIB = ranlib
 ac_ct_STRIP = strip
@@ -229,7 +229,7 @@
 build_vendor = pc
 datadir = ${prefix}/share
 exec_prefix = ${prefix}
-guile_available = /usr/bin/guile
+guile_available = 
 host = i686-pc-linux-gnu
 host_alias = 
 host_cpu = i686
@@ -244,7 +244,7 @@
 mandir = ${prefix}/man
 mkdir_p = mkdir -p -- .
 oldincludedir = /usr/include
-prefix = /home/grothoff
+prefix = /home/grothoff/
 program_transform_name = s,x,x,
 sbindir = ${exec_prefix}/sbin
 sharedstatedir = ${prefix}/com