1 files changed, 133 insertions, 48 deletions

diff --git a/contrib/Makefile.in b/contrib/Makefile.in
index 34ab9e6c..5ab2bdab 100644
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  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.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/gnunet_gtk_config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -63,16 +66,58 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(pkgdatadir)"
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(pkgdata_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+        $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+        distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -142,6 +187,7 @@ PACKAGE_DATA = @PACKAGE_DATA@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -205,6 +251,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = .
@@ -235,14 +282,14 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
         @for dep in $?; do \
           case '$(am__configure_deps)' in \
             *$$dep*) \
-              cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-                && exit 0; \
+              ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+                && { if test -f $@; then exit 0; else break; fi; }; \
               exit 1;; \
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  contrib/Makefile'; \
-        cd $(top_srcdir) && \
-          $(AUTOMAKE) --gnu  contrib/Makefile
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/Makefile'; \
+        $(am__cd) $(top_srcdir) && \
+          $(AUTOMAKE) --gnu contrib/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
         @case '$?' in \
@@ -260,6 +307,7 @@ $(top_srcdir)/configure:  $(am__configure_deps)
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
         -rm -f *.lo
@@ -269,20 +317,23 @@ clean-libtool:
 install-pkgdataDATA: $(pkgdata_DATA)
         @$(NORMAL_INSTALL)
         test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
-        @list='$(pkgdata_DATA)'; for p in $$list; do \
+        @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+        for p in $$list; do \
           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-          f=$(am__strip_dir) \
-          echo " $(pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
-          $(pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
+          echo "$$d$$p"; \
+        done | $(am__base_list) | \
+        while read files; do \
+          echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+          $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
         done
 
 uninstall-pkgdataDATA:
         @$(NORMAL_UNINSTALL)
-        @list='$(pkgdata_DATA)'; for p in $$list; do \
-          f=$(am__strip_dir) \
-          echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
-          rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
-        done
+        @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+        test -n "$$files" || exit 0; \
+        echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+        cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -291,7 +342,7 @@ uninstall-pkgdataDATA:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-        @failcom='exit 1'; \
+        @fail= failcom='exit 1'; \
         for f in x $$MAKEFLAGS; do \
           case $$f in \
             *=* | --[!k]*);; \
@@ -308,7 +359,7 @@ $(RECURSIVE_TARGETS):
           else \
             local_target="$$target"; \
           fi; \
-          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+          ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
           || eval $$failcom; \
         done; \
         if test "$$dot_seen" = "no"; then \
@@ -316,7 +367,7 @@ $(RECURSIVE_TARGETS):
         fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-        @failcom='exit 1'; \
+        @fail= failcom='exit 1'; \
         for f in x $$MAKEFLAGS; do \
           case $$f in \
             *=* | --[!k]*);; \
@@ -342,16 +393,16 @@ $(RECURSIVE_CLEAN_TARGETS):
           else \
             local_target="$$target"; \
           fi; \
-          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+          ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
           || eval $$failcom; \
         done && test -z "$$fail"
 tags-recursive:
         list='$(SUBDIRS)'; for subdir in $$list; do \
-          test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+          test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
         done
 ctags-recursive:
         list='$(SUBDIRS)'; for subdir in $$list; do \
-          test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+          test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
         done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -359,14 +410,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
         unique=`for i in $$list; do \
             if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
           done | \
-          $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
               END { if (nonempty) { for (i in files) print i; }; }'`; \
         mkid -fID $$unique
 tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
                 $(TAGS_FILES) $(LISP)
-        tags=; \
+        set x; \
         here=`pwd`; \
         if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
           include_option=--etags-include; \
@@ -378,7 +429,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
         list='$(SUBDIRS)'; for subdir in $$list; do \
           if test "$$subdir" = .; then :; else \
             test ! -f $$subdir/TAGS || \
-              tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+              set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
           fi; \
         done; \
         list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -387,29 +438,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
           done | \
           $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
               END { if (nonempty) { for (i in files) print i; }; }'`; \
-        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+        shift; \
+        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
           test -n "$$unique" || unique=$$empty_fix; \
-          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-            $$tags $$unique; \
+          if test $$# -gt 0; then \
+            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+              "$$@" $$unique; \
+          else \
+            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+              $$unique; \
+          fi; \
         fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
                 $(TAGS_FILES) $(LISP)
-        tags=; \
         list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
         unique=`for i in $$list; do \
             if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
           done | \
           $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
               END { if (nonempty) { for (i in files) print i; }; }'`; \
-        test -z "$(CTAGS_ARGS)$$tags$$unique" \
+        test -z "$(CTAGS_ARGS)$$unique" \
           || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-             $$tags $$unique
+             $$unique
 
 GTAGS:
         here=`$(am__cd) $(top_builddir) && pwd` \
-          && cd $(top_srcdir) \
-          && gtags -i $(GTAGS_ARGS) $$here
+          && $(am__cd) $(top_srcdir) \
+          && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -430,29 +486,44 @@ distdir: $(DISTFILES)
           if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
           if test -d $$d/$$file; then \
             dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+            if test -d "$(distdir)/$$file"; then \
+              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+            fi; \
             if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-              cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+              cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
             fi; \
-            cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
           else \
-            test -f $(distdir)/$$file \
-            || cp -p $$d/$$file $(distdir)/$$file \
+            test -f "$(distdir)/$$file" \
+            || cp -p $$d/$$file "$(distdir)/$$file" \
             || exit 1; \
           fi; \
         done
-        list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+        @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
           if test "$$subdir" = .; then :; else \
             test -d "$(distdir)/$$subdir" \
             || $(MKDIR_P) "$(distdir)/$$subdir" \
             || exit 1; \
-            distdir=`$(am__cd) $(distdir) && pwd`; \
-            top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-            (cd $$subdir && \
+          fi; \
+        done
+        @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+          if test "$$subdir" = .; then :; else \
+            dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+            $(am__relativize); \
+            new_distdir=$$reldir; \
+            dir1=$$subdir; dir2="$(top_distdir)"; \
+            $(am__relativize); \
+            new_top_distdir=$$reldir; \
+            echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+            echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+            ($(am__cd) $$subdir && \
               $(MAKE) $(AM_MAKEFLAGS) \
-                top_distdir="$$top_distdir" \
-                distdir="$$distdir/$$subdir" \
+                top_distdir="$$new_top_distdir" \
+                distdir="$$new_distdir" \
                 am__remove_distdir=: \
                 am__skip_length_check=: \
+                am__skip_mode_fix=: \
                 distdir) \
               || exit 1; \
           fi; \
@@ -488,6 +559,7 @@ clean-generic:
 
 distclean-generic:
         -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
         @echo "This command is intended for maintainers to use"
@@ -506,6 +578,8 @@ dvi-am:
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -514,18 +588,28 @@ install-data-am: install-data-local install-pkgdataDATA
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -546,8 +630,8 @@ ps-am:
 
 uninstall-am: uninstall-pkgdataDATA
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-        install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+        install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
         all all-am check check-am clean clean-generic clean-libtool \
@@ -584,6 +668,7 @@ dist-hook:
             fi \
           done \
         fi
+
 # 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.
 .NOEXPORT: