naming

6 files changed, 126 insertions, 199 deletions

diff --git a/contrib/Makefile.in b/contrib/Makefile.in
index 4c083964..34ab9e6c 100644
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -17,9 +16,8 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,10 +46,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
         $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+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 \
@@ -66,58 +63,16 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 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@
@@ -187,7 +142,6 @@ 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@
@@ -251,7 +205,6 @@ 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 = .
@@ -282,14 +235,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 ) \
-                && { if test -f $@; then exit 0; else break; fi; }; \
+              cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+                && exit 0; \
               exit 1;; \
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/Makefile'; \
-        $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --gnu contrib/Makefile
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  contrib/Makefile'; \
+        cd $(top_srcdir) && \
+          $(AUTOMAKE) --gnu  contrib/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
         @case '$?' in \
@@ -307,7 +260,6 @@ $(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
@@ -317,23 +269,20 @@ clean-libtool:
 install-pkgdataDATA: $(pkgdata_DATA)
         @$(NORMAL_INSTALL)
         test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
-        @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-        for p in $$list; do \
+        @list='$(pkgdata_DATA)'; for p in $$list; do \
           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-          echo "$$d$$p"; \
-        done | $(am__base_list) | \
-        while read files; do \
-          echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
-          $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
+          f=$(am__strip_dir) \
+          echo " $(pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
+          $(pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
         done
 
 uninstall-pkgdataDATA:
         @$(NORMAL_UNINSTALL)
-        @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
+        @list='$(pkgdata_DATA)'; for p in $$list; do \
+          f=$(am__strip_dir) \
+          echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
+          rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
+        done
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -342,7 +291,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):
-        @fail= failcom='exit 1'; \
+        @failcom='exit 1'; \
         for f in x $$MAKEFLAGS; do \
           case $$f in \
             *=* | --[!k]*);; \
@@ -359,7 +308,7 @@ $(RECURSIVE_TARGETS):
           else \
             local_target="$$target"; \
           fi; \
-          ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
           || eval $$failcom; \
         done; \
         if test "$$dot_seen" = "no"; then \
@@ -367,7 +316,7 @@ $(RECURSIVE_TARGETS):
         fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-        @fail= failcom='exit 1'; \
+        @failcom='exit 1'; \
         for f in x $$MAKEFLAGS; do \
           case $$f in \
             *=* | --[!k]*);; \
@@ -393,16 +342,16 @@ $(RECURSIVE_CLEAN_TARGETS):
           else \
             local_target="$$target"; \
           fi; \
-          ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
           || eval $$failcom; \
         done && test -z "$$fail"
 tags-recursive:
         list='$(SUBDIRS)'; for subdir in $$list; do \
-          test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+          test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
         done
 ctags-recursive:
         list='$(SUBDIRS)'; for subdir in $$list; do \
-          test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+          test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
         done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -410,14 +359,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; nonempty = 1; } \
+          $(AWK) '{ files[$$0] = 1; nonemtpy = 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)
-        set x; \
+        tags=; \
         here=`pwd`; \
         if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
           include_option=--etags-include; \
@@ -429,7 +378,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
         list='$(SUBDIRS)'; for subdir in $$list; do \
           if test "$$subdir" = .; then :; else \
             test ! -f $$subdir/TAGS || \
-              set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+              tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
           fi; \
         done; \
         list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -438,34 +387,29 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
           done | \
           $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
               END { if (nonempty) { for (i in files) print i; }; }'`; \
-        shift; \
-        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
           test -n "$$unique" || unique=$$empty_fix; \
-          if test $$# -gt 0; then \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              "$$@" $$unique; \
-          else \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              $$unique; \
-          fi; \
+          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+            $$tags $$unique; \
         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)$$unique" \
+        test -z "$(CTAGS_ARGS)$$tags$$unique" \
           || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-             $$unique
+             $$tags $$unique
 
 GTAGS:
         here=`$(am__cd) $(top_builddir) && pwd` \
-          && $(am__cd) $(top_srcdir) \
-          && gtags -i $(GTAGS_ARGS) "$$here"
+          && cd $(top_srcdir) \
+          && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -486,44 +430,29 @@ 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 -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+              cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
             fi; \
-            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+            cp -pR $$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; \
-          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 && \
+            distdir=`$(am__cd) $(distdir) && pwd`; \
+            top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+            (cd $$subdir && \
               $(MAKE) $(AM_MAKEFLAGS) \
-                top_distdir="$$new_top_distdir" \
-                distdir="$$new_distdir" \
+                top_distdir="$$top_distdir" \
+                distdir="$$distdir/$$subdir" \
                 am__remove_distdir=: \
                 am__skip_length_check=: \
-                am__skip_mode_fix=: \
                 distdir) \
               || exit 1; \
           fi; \
@@ -559,7 +488,6 @@ 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"
@@ -578,8 +506,6 @@ dvi-am:
 
 html: html-recursive
 
-html-am:
-
 info: info-recursive
 
 info-am:
@@ -588,28 +514,18 @@ 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
@@ -630,8 +546,8 @@ ps-am:
 
 uninstall-am: uninstall-pkgdataDATA
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-        install-am install-strip tags-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+        install-strip
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
         all all-am check check-am clean clean-generic clean-libtool \
@@ -668,7 +584,6 @@ 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:
diff --git a/gnunet_gtk_config.h.in b/gnunet_gtk_config.h.in
index 91797001..7c00b60a 100644
--- a/gnunet_gtk_config.h.in
+++ b/gnunet_gtk_config.h.in
@@ -177,9 +177,6 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
diff --git a/ltmain.sh b/ltmain.sh
index d88da2c2..b36c4ad3 100755
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,6 +1,6 @@
 # Generated from ltmain.m4sh.
 
-# ltmain.sh (GNU libtool) 2.2.6b
+# ltmain.sh (GNU libtool) 2.2.6
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
@@ -65,7 +65,7 @@
 #       compiler:               $LTCC
 #       compiler flags:         $LTCFLAGS
 #       linker:         $LD (gnu? $with_gnu_ld)
-#       $progname:              (GNU libtool) 2.2.6b Debian-2.2.6b-2
+#       $progname:              (GNU libtool) 2.2.6
 #       automake:               $automake_version
 #       autoconf:               $autoconf_version
 #
@@ -73,9 +73,9 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="2.2.6b Debian-2.2.6b-2"
+VERSION=2.2.6
 TIMESTAMP=""
-package_revision=1.3017
+package_revision=1.3012
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -116,15 +116,15 @@ $lt_unset CDPATH
 
 : ${CP="cp -f"}
 : ${ECHO="echo"}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
+: ${EGREP="/usr/bin/grep -E"}
+: ${FGREP="/usr/bin/grep -F"}
+: ${GREP="/usr/bin/grep"}
 : ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="/bin/sed"}
+: ${SED="/opt/local/bin/gsed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -5033,10 +5033,7 @@ func_mode_link ()
         case $pass in
         dlopen) libs="$dlfiles" ;;
         dlpreopen) libs="$dlprefiles" ;;
-        link)
-          libs="$deplibs %DEPLIBS%"
-          test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-          ;;
+        link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
         esac
       fi
       if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -5347,19 +5344,19 @@ func_mode_link ()
             # It is a libtool convenience library, so add in its objects.
             convenience="$convenience $ladir/$objdir/$old_library"
             old_convenience="$old_convenience $ladir/$objdir/$old_library"
-            tmp_libs=
-            for deplib in $dependency_libs; do
-              deplibs="$deplib $deplibs"
-              if $opt_duplicate_deps ; then
-                case "$tmp_libs " in
-                *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-                esac
-              fi
-              tmp_libs="$tmp_libs $deplib"
-            done
           elif test "$linkmode" != prog && test "$linkmode" != lib; then
             func_fatal_error "\`$lib' is not a convenience library"
           fi
+          tmp_libs=
+          for deplib in $dependency_libs; do
+            deplibs="$deplib $deplibs"
+            if $opt_duplicate_deps ; then
+              case "$tmp_libs " in
+              *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+              esac
+            fi
+            tmp_libs="$tmp_libs $deplib"
+          done
           continue
         fi # $pass = conv
 
@@ -5896,7 +5893,6 @@ func_mode_link ()
           if test "$link_all_deplibs" != no; then
             # Add the search paths of all dependency libraries
             for deplib in $dependency_libs; do
-              path=
               case $deplib in
               -L*) path="$deplib" ;;
               *.la)
@@ -6210,9 +6206,6 @@ func_mode_link ()
             revision="$number_minor"
             lt_irix_increment=no
             ;;
-          *)
-            func_fatal_configuration "$modename: unknown library version type \`$version_type'"
-            ;;
           esac
           ;;
         no)
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index a3fee536..39ba996c 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -2445,7 +2445,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -2485,18 +2485,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -3084,11 +3072,11 @@ irix5* | irix6* | nonstopux*)
   ;;
 
 # This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd* | netbsdelf*-gnu)
+netbsd*)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   else
@@ -3705,7 +3693,7 @@ m4_if([$1], [CXX], [
             ;;
         esac
         ;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu)
         case $cc_basename in
           KCC*)
             # KAI C++ Compiler
@@ -3769,7 +3757,7 @@ m4_if([$1], [CXX], [
             ;;
         esac
         ;;
-      netbsd* | netbsdelf*-gnu)
+      netbsd*)
         ;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -3989,7 +3977,7 @@ m4_if([$1], [CXX], [
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -4194,9 +4182,6 @@ m4_if([$1], [CXX], [
   cygwin* | mingw* | cegcc*)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
-  linux* | k*bsd*-gnu)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-  ;;
   *)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
@@ -4261,9 +4246,6 @@ dnl Note also adjust exclude_expsyms for C++ above.
   openbsd*)
     with_gnu_ld=no
     ;;
-  linux* | k*bsd*-gnu)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-    ;;
   esac
 
   _LT_TAGVAR(ld_shlibs, $1)=yes
@@ -4285,7 +4267,6 @@ dnl Note also adjust exclude_expsyms for C++ above.
     fi
     supports_anon_versioning=no
     case `$LD -v 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -4377,7 +4358,7 @@ _LT_EOF
       _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+    gnu* | linux* | tpf* | k*bsd*-gnu)
       tmp_diet=no
       if test "$host_os" = linux-dietlibc; then
         case $cc_basename in
@@ -4447,7 +4428,7 @@ _LT_EOF
       fi
       ;;
 
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
         _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
         wlarc=
@@ -4622,7 +4603,6 @@ _LT_EOF
         if test "$aix_use_runtimelinking" = yes; then
           shared_flag="$shared_flag "'${wl}-G'
         fi
-        _LT_TAGVAR(link_all_deplibs, $1)=no
       else
         # not using gcc
         if test "$host_cpu" = ia64; then
@@ -4861,7 +4841,7 @@ _LT_EOF
       _LT_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
         _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -5861,7 +5841,7 @@ if test "$_lt_caught_CXX_error" != yes; then
         _LT_TAGVAR(inherit_rpath, $1)=yes
         ;;
 
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu)
         case $cc_basename in
           KCC*)
             # Kuck and Associates, Inc. (KAI) C++ Compiler
diff --git a/m4/ltversion.m4 b/m4/ltversion.m4
index f3c53098..b8e154fe 100644
--- a/m4/ltversion.m4
+++ b/m4/ltversion.m4
@@ -9,15 +9,15 @@
 
 # Generated from ltversion.in.
 
-# serial 3017 ltversion.m4
+# serial 3012 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-m4_define([LT_PACKAGE_REVISION], [1.3017])
+m4_define([LT_PACKAGE_VERSION], [2.2.6])
+m4_define([LT_PACKAGE_REVISION], [1.3012])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6b'
-macro_revision='1.3017'
+[macro_version='2.2.6'
+macro_revision='1.3012'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
diff --git a/src/edit_publish_dialog.c b/src/edit_publish_dialog.c
index 932088af..16cee5ac 100644
--- a/src/edit_publish_dialog.c
+++ b/src/edit_publish_dialog.c
@@ -31,6 +31,10 @@
  */
 static GtkBuilder *builder;
 
+/**
+ * Are we editing metadata for a directory?
+ */
+static int is_directory;
 
 void
 GNUNET_GTK_edit_file_information_keyword_list_normalize_button_clicked_cb ()
@@ -197,6 +201,8 @@ void
 GNUNET_GTK_edit_file_information_metadata_add_button_clicked_cb ()
 {
   const char *value;
+  char *avalue;
+  const char *ivalue;
   GtkEntry *entry;
   GtkListStore *ls;
   GtkTreeModel *tm;
@@ -204,6 +210,8 @@ GNUNET_GTK_edit_file_information_metadata_add_button_clicked_cb ()
   GtkTreeSelection *sel;
   GtkTreeIter iter;
   guint type;
+  size_t slen;
+  char *pos;
 
   entry = GTK_ENTRY (gtk_builder_get_object (builder,
                                              "GNUNET_GTK_edit_file_information_metadata_value_entry"));
@@ -229,12 +237,46 @@ GNUNET_GTK_edit_file_information_metadata_add_button_clicked_cb ()
                       1, &type, -1);
   ls = GTK_LIST_STORE (gtk_builder_get_object (builder,
                                                "GNUNET_GTK_meta_data_list_store"));
+  if ( (type == EXTRACTOR_METATYPE_FILENAME) &&
+       (value[strlen(value)-1] != '/') &&
+       (is_directory) )
+    {      
+      GNUNET_asprintf (&avalue,
+                       "%s/",
+                       value);
+      /* if user typed '\' instead of '/', change it! */
+      slen = strlen (avalue);
+      while ( (slen > 1) &&
+              (avalue[slen-2] == '\\') )
+        {
+          avalue[slen-2] = '/';
+          avalue[slen-1] = '\0';
+          slen--;
+        }
+      while (NULL != (pos = strstr (avalue, "\\")))
+        *pos = '/';
+      /* remove '../' everywhere */
+      while (NULL != (pos = strstr (avalue, "../")))
+        {
+          pos[0] = '_';
+          pos[1] = '_';
+          pos[2] = '_';
+        }
+      ivalue = avalue;
+    }
+  else
+    {
+      ivalue = value;
+      avalue = NULL;
+    }
+
   gtk_list_store_insert_with_values (ls, &iter, G_MAXINT,
                                      0, type,
                                      1, (guint) EXTRACTOR_METAFORMAT_UTF8,
                                      2, EXTRACTOR_metatype_to_string (type),
-                                     3, value,
+                                     3, ivalue,
                                      -1);
+  GNUNET_free_non_null (avalue);   
   gtk_entry_set_text (GTK_ENTRY (entry), "");
 }