Skip to content
This repository
Browse code

A few bugfixes:

 * po/Makefile.in now has a relative path to install-sh
 * In Ubuntu 12.04 no GTK main thread is running so the call to Gtk.main_quit () had no effect. Now the app i killed with a call to destroy() instead.
 * Some notifications were missed in the last refactoring (fex when a download fail).

Everything now seems to run fine in at least Ubuntu 12.04.
  • Loading branch information...
commit 7b1c13b458b08a66d86f19d322bc04f3b7570166 1 parent dfcc3e9
authored May 10, 2012
15  README
@@ -37,17 +37,6 @@ This is what's in Ubuntu 11.10.
37 37
 Build from Vala sources
38 38
 ================================================================================
39 39
 
40  
-If you build from the Vala sources Vala 0.14 is required. Before running
41  
-`./autogen.sh` you need to export the variable `RL_WITH_VALA` like
  40
+If you build from the Vala sources Vala 0.14 is required.
42 41
 
43  
-  name@machine:~$ export RL_WITH_VALA=true
44  
-	
45  
-or run 
46  
-
47  
-  name@machine:~$ ./conf-with-vala
48  
-
49  
-if you have downloaded the development branch.
50  
-
51  
-# Pontus Östlund - 2011-11-08
52  
-# Pontus Östlund - 2010-09-22
53  
-# Pontus Östlund - 2009-12-18
  42
+# Pontus Östlund - 2012-05-10
2  autogen.sh
@@ -9,5 +9,5 @@ PKG_NAME="roxenlauncher"
9 9
 if test -f "/usr/bin/gnome-autogen.sh"; then
10 10
   . gnome-autogen.sh
11 11
 else
12  
-  . ./kde-autogen.sh
  12
+  echo "You need to install \"gnome-common\""
13 13
 fi
4  configure.ac
... ...
@@ -1,12 +1,13 @@
1 1
 AC_PREREQ([2.64])
2 2
 AC_INIT(roxenlauncher, 
3  
-        2.0.2,
  3
+        2.0.3,
4 4
         [pontus@poppa.se], 
5 5
         [roxenlauncher],
6 6
         [https://github.com/poppa/Roxen-Application-Launcher])
7 7
 AC_CONFIG_HEADERS([config.h])
8 8
 AC_CONFIG_SRCDIR([configure.ac])
9 9
 AC_CONFIG_MACRO_DIR([m4])
  10
+AC_CHECK_LIB(gthread-2.0, g_thread_init)
10 11
 
11 12
 AM_INIT_AUTOMAKE([1.1 -Wall])
12 13
 AM_MAINTAINER_MODE([enable])
@@ -39,7 +40,6 @@ AC_SUBST(GETTEXT_PACKAGE)
39 40
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
40 41
 IT_PROG_INTLTOOL([0.40.0])
41 42
 
42  
-
43 43
 AC_SUBST(CFLAGS)
44 44
 AC_SUBST(CPPFLAGS)
45 45
 AC_SUBST(LDFLAGS)
73  m4/intltool.m4
@@ -23,7 +23,7 @@
23 23
 ## the same distribution terms that you use for the rest of that program.
24 24
 
25 25
 dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
26  
-# serial 40 IT_PROG_INTLTOOL
  26
+# serial 42 IT_PROG_INTLTOOL
27 27
 AC_DEFUN([IT_PROG_INTLTOOL], [
28 28
 AC_PREREQ([2.50])dnl
29 29
 AC_REQUIRE([AM_NLS])dnl
@@ -36,13 +36,11 @@ case "$am__api_version" in
36 36
     ;;
37 37
 esac
38 38
 
  39
+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
  40
+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
  41
+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
39 42
 if test -n "$1"; then
40 43
     AC_MSG_CHECKING([for intltool >= $1])
41  
-
42  
-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
43  
-    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
44  
-    [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
45  
-    ]
46 44
     AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
47 45
     test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
48 46
 	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
@@ -55,25 +53,48 @@ if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT";
55 53
     AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
56 54
 fi
57 55
 
58  
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
59  
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
60  
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
61  
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
62  
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
63  
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
64  
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
65  
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
66  
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
67  
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
68  
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
69  
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' 
70  
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
71  
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
72  
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
73  
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
74  
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
75  
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
76  
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
  56
+if test -z "$AM_DEFAULT_VERBOSITY"; then
  57
+  AM_DEFAULT_VERBOSITY=1
  58
+fi
  59
+AC_SUBST([AM_DEFAULT_VERBOSITY])
  60
+
  61
+INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
  62
+INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
  63
+INTLTOOL__v_MERGE_0='@echo "  ITMRG " [$]@;'
  64
+AC_SUBST(INTLTOOL_V_MERGE)
  65
+AC_SUBST(INTLTOOL__v_MERGE_)
  66
+AC_SUBST(INTLTOOL__v_MERGE_0)
  67
+
  68
+INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
  69
+intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
  70
+intltool__v_merge_options_0='-q'
  71
+AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
  72
+AC_SUBST(intltool__v_merge_options_)
  73
+AC_SUBST(intltool__v_merge_options_0)
  74
+
  75
+  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
  76
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
  77
+     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
  78
+     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
  79
+      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@'
  80
+     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
  81
+   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
  82
+    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
  83
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
  84
+       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
  85
+      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
  86
+if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
  87
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@'
  88
+else
  89
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir'
  90
+fi
  91
+      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
  92
+      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
  93
+    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
  94
+  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
  95
+    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
  96
+    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
  97
+   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
77 98
 
78 99
 _IT_SUBST(INTLTOOL_DESKTOP_RULE)
79 100
 _IT_SUBST(INTLTOOL_DIRECTORY_RULE)
@@ -119,7 +140,7 @@ $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
119 140
 if test $? -ne 0; then
120 141
    AC_MSG_ERROR([perl 5.8.1 is required for intltool])
121 142
 else
122  
-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
  143
+   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
123 144
    AC_MSG_RESULT([$IT_PERL_VERSION])
124 145
 fi
125 146
 if test "x$2" != "xno-xml"; then
264  m4/libtool.m4
... ...
@@ -1,8 +1,8 @@
1 1
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
2 2
 #
3 3
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
4  
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
5  
-#                 Inc.
  4
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
  5
+#                 Foundation, Inc.
6 6
 #   Written by Gordon Matzigkeit, 1996
7 7
 #
8 8
 # This file is free software; the Free Software Foundation gives
@@ -11,8 +11,8 @@
11 11
 
12 12
 m4_define([_LT_COPYING], [dnl
13 13
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
14  
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
15  
-#                 Inc.
  14
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
  15
+#                 Foundation, Inc.
16 16
 #   Written by Gordon Matzigkeit, 1996
17 17
 #
18 18
 #   This file is part of GNU Libtool.
@@ -146,6 +146,8 @@ AC_REQUIRE([AC_CANONICAL_BUILD])dnl
146 146
 AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
147 147
 AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
148 148
 
  149
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
  150
+dnl
149 151
 _LT_DECL([], [host_alias], [0], [The host system])dnl
150 152
 _LT_DECL([], [host], [0])dnl
151 153
 _LT_DECL([], [host_os], [0])dnl
@@ -637,7 +639,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
637 639
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
638 640
 configured by $[0], generated by m4_PACKAGE_STRING.
639 641
 
640  
-Copyright (C) 2010 Free Software Foundation, Inc.
  642
+Copyright (C) 2011 Free Software Foundation, Inc.
641 643
 This config.lt script is free software; the Free Software Foundation
642 644
 gives unlimited permision to copy, distribute and modify it."
643 645
 
@@ -801,6 +803,7 @@ AC_DEFUN([LT_LANG],
801 803
 m4_case([$1],
802 804
   [C],			[_LT_LANG(C)],
803 805
   [C++],		[_LT_LANG(CXX)],
  806
+  [Go],			[_LT_LANG(GO)],
804 807
   [Java],		[_LT_LANG(GCJ)],
805 808
   [Fortran 77],		[_LT_LANG(F77)],
806 809
   [Fortran],		[_LT_LANG(FC)],
@@ -822,6 +825,31 @@ m4_defun([_LT_LANG],
822 825
 ])# _LT_LANG
823 826
 
824 827
 
  828
+m4_ifndef([AC_PROG_GO], [
  829
+############################################################
  830
+# NOTE: This macro has been submitted for inclusion into   #
  831
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
  832
+#  a released version of Autoconf we should remove this    #
  833
+#  macro and use it instead.                               #
  834
+############################################################
  835
+m4_defun([AC_PROG_GO],
  836
+[AC_LANG_PUSH(Go)dnl
  837
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
  838
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
  839
+_AC_ARG_VAR_LDFLAGS()dnl
  840
+AC_CHECK_TOOL(GOC, gccgo)
  841
+if test -z "$GOC"; then
  842
+  if test -n "$ac_tool_prefix"; then
  843
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
  844
+  fi
  845
+fi
  846
+if test -z "$GOC"; then
  847
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
  848
+fi
  849
+])#m4_defun
  850
+])#m4_ifndef
  851
+
  852
+
825 853
 # _LT_LANG_DEFAULT_CONFIG
826 854
 # -----------------------
827 855
 m4_defun([_LT_LANG_DEFAULT_CONFIG],
@@ -852,6 +880,10 @@ AC_PROVIDE_IFELSE([AC_PROG_GCJ],
852 880
        m4_ifdef([LT_PROG_GCJ],
853 881
 	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
854 882
 
  883
+AC_PROVIDE_IFELSE([AC_PROG_GO],
  884
+  [LT_LANG(GO)],
  885
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
  886
+
855 887
 AC_PROVIDE_IFELSE([LT_PROG_RC],
856 888
   [LT_LANG(RC)],
857 889
   [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
@@ -954,7 +986,13 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
954 986
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
955 987
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
956 988
         _lt_result=$?
957  
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
  989
+	# If there is a non-empty error log, and "single_module"
  990
+	# appears in it, assume the flag caused a linker warning
  991
+        if test -s conftest.err && $GREP single_module conftest.err; then
  992
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
  993
+	# Otherwise, if the output was created with a 0 exit code from
  994
+	# the compiler, it worked.
  995
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
958 996
 	  lt_cv_apple_cc_single_mod=yes
959 997
 	else
960 998
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -962,6 +1000,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
962 1000
 	rm -rf libconftest.dylib*
963 1001
 	rm -f conftest.*
964 1002
       fi])
  1003
+
965 1004
     AC_CACHE_CHECK([for -exported_symbols_list linker flag],
966 1005
       [lt_cv_ld_exported_symbols_list],
967 1006
       [lt_cv_ld_exported_symbols_list=no
@@ -973,6 +1012,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
973 1012
 	[lt_cv_ld_exported_symbols_list=no])
974 1013
 	LDFLAGS="$save_LDFLAGS"
975 1014
     ])
  1015
+
976 1016
     AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
977 1017
       [lt_cv_ld_force_load=no
978 1018
       cat > conftest.c << _LT_EOF
@@ -990,7 +1030,9 @@ _LT_EOF
990 1030
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
991 1031
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
992 1032
       _lt_result=$?
993  
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
  1033
+      if test -s conftest.err && $GREP force_load conftest.err; then
  1034
+	cat conftest.err >&AS_MESSAGE_LOG_FD
  1035
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
994 1036
 	lt_cv_ld_force_load=yes
995 1037
       else
996 1038
 	cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1035,8 +1077,8 @@ _LT_EOF
1035 1077
 ])
1036 1078
 
1037 1079
 
1038  
-# _LT_DARWIN_LINKER_FEATURES
1039  
-# --------------------------
  1080
+# _LT_DARWIN_LINKER_FEATURES([TAG])
  1081
+# ---------------------------------
1040 1082
 # Checks for linker and compiler features on darwin
1041 1083
 m4_defun([_LT_DARWIN_LINKER_FEATURES],
1042 1084
 [
@@ -1047,6 +1089,8 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
1047 1089
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
1048 1090
   if test "$lt_cv_ld_force_load" = "yes"; then
1049 1091
     _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
  1092
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
  1093
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
1050 1094
   else
1051 1095
     _LT_TAGVAR(whole_archive_flag_spec, $1)=''
1052 1096
   fi
@@ -1330,14 +1374,27 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
1330 1374
     CFLAGS="$SAVE_CFLAGS"
1331 1375
   fi
1332 1376
   ;;
1333  
-sparc*-*solaris*)
  1377
+*-*solaris*)
1334 1378
   # Find out which ABI we are using.
1335 1379
   echo 'int i;' > conftest.$ac_ext
1336 1380
   if AC_TRY_EVAL(ac_compile); then
1337 1381
     case `/usr/bin/file conftest.o` in
1338 1382
     *64-bit*)
1339 1383
       case $lt_cv_prog_gnu_ld in
1340  
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
  1384
+      yes*)
  1385
+        case $host in
  1386
+        i?86-*-solaris*)
  1387
+          LD="${LD-ld} -m elf_x86_64"
  1388
+          ;;
  1389
+        sparc*-*-solaris*)
  1390
+          LD="${LD-ld} -m elf64_sparc"
  1391
+          ;;
  1392
+        esac
  1393
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
  1394
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
  1395
+          LD="${LD-ld}_sol2"
  1396
+        fi
  1397
+        ;;
1341 1398
       *)
1342 1399
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
1343 1400
 	  LD="${LD-ld} -64"
@@ -1414,13 +1471,13 @@ old_postuninstall_cmds=
1414 1471
 if test -n "$RANLIB"; then
1415 1472
   case $host_os in
1416 1473
   openbsd*)
1417  
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
  1474
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
1418 1475
     ;;
1419 1476
   *)
1420  
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
  1477
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
1421 1478
     ;;
1422 1479
   esac
1423  
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
  1480
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
1424 1481
 fi
1425 1482
 
1426 1483
 case $host_os in
@@ -1600,6 +1657,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
1600 1657
     lt_cv_sys_max_cmd_len=196608
1601 1658
     ;;
1602 1659
 
  1660
+  os2*)
  1661
+    # The test takes a long time on OS/2.
  1662
+    lt_cv_sys_max_cmd_len=8192
  1663
+    ;;
  1664
+
1603 1665
   osf*)
1604 1666
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
1605 1667
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -1639,7 +1701,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
1639 1701
       # If test is not a shell built-in, we'll probably end up computing a
1640 1702
       # maximum length that is only half of the actual maximum length, but
1641 1703
       # we can't tell.
1642  
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
  1704
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
1643 1705
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
1644 1706
 	      test $i != 17 # 1/2 MB should be enough
1645 1707
       do
@@ -2185,7 +2247,7 @@ need_version=unknown
2185 2247
 
2186 2248
 case $host_os in
2187 2249
 aix3*)
2188  
-  version_type=linux
  2250
+  version_type=linux # correct to gnu/linux during the next big refactor
2189 2251
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
2190 2252
   shlibpath_var=LIBPATH
2191 2253
 
@@ -2194,7 +2256,7 @@ aix3*)
2194 2256
   ;;
2195 2257
 
2196 2258
 aix[[4-9]]*)
2197  
-  version_type=linux
  2259
+  version_type=linux # correct to gnu/linux during the next big refactor
2198 2260
   need_lib_prefix=no
2199 2261
   need_version=no
2200 2262
   hardcode_into_libs=yes
@@ -2259,7 +2321,7 @@ beos*)
2259 2321
   ;;
2260 2322
 
2261 2323
 bsdi[[45]]*)
2262  
-  version_type=linux
  2324
+  version_type=linux # correct to gnu/linux during the next big refactor
2263 2325
   need_version=no
2264 2326
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
2265 2327
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -2398,7 +2460,7 @@ m4_if([$1], [],[
2398 2460
   ;;
2399 2461
 
2400 2462
 dgux*)
2401  
-  version_type=linux
  2463
+  version_type=linux # correct to gnu/linux during the next big refactor
2402 2464
   need_lib_prefix=no
2403 2465
   need_version=no
2404 2466
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -2406,10 +2468,6 @@ dgux*)
2406 2468
   shlibpath_var=LD_LIBRARY_PATH
2407 2469
   ;;
2408 2470
 
2409  
-freebsd1*)
2410  
-  dynamic_linker=no
2411  
-  ;;
2412  
-
2413 2471
 freebsd* | dragonfly*)
2414 2472
   # DragonFly does not have aout.  When/if they implement a new
2415 2473
   # versioning mechanism, adjust this.
@@ -2417,7 +2475,7 @@ freebsd* | dragonfly*)
2417 2475
     objformat=`/usr/bin/objformat`
2418 2476
   else
2419 2477
     case $host_os in
2420  
-    freebsd[[123]]*) objformat=aout ;;
  2478
+    freebsd[[23]].*) objformat=aout ;;
2421 2479
     *) objformat=elf ;;
2422 2480
     esac
2423 2481
   fi
@@ -2435,7 +2493,7 @@ freebsd* | dragonfly*)
2435 2493
   esac
2436 2494
   shlibpath_var=LD_LIBRARY_PATH
2437 2495
   case $host_os in
2438  
-  freebsd2*)
  2496
+  freebsd2.*)
2439 2497
     shlibpath_overrides_runpath=yes
2440 2498
     ;;
2441 2499
   freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -2455,7 +2513,7 @@ freebsd* | dragonfly*)
2455 2513
   ;;
2456 2514
 
2457 2515
 gnu*)
2458  
-  version_type=linux
  2516
+  version_type=linux # correct to gnu/linux during the next big refactor
2459 2517
   need_lib_prefix=no
2460 2518
   need_version=no
2461 2519
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
@@ -2466,7 +2524,7 @@ gnu*)
2466 2524
   ;;
2467 2525
 
2468 2526
 haiku*)
2469  
-  version_type=linux
  2527
+  version_type=linux # correct to gnu/linux during the next big refactor
2470 2528
   need_lib_prefix=no
2471 2529
   need_version=no
2472 2530
   dynamic_linker="$host_os runtime_loader"
@@ -2527,7 +2585,7 @@ hpux9* | hpux10* | hpux11*)
2527 2585
   ;;
2528 2586
 
2529 2587
 interix[[3-9]]*)
2530  
-  version_type=linux
  2588
+  version_type=linux # correct to gnu/linux during the next big refactor
2531 2589
   need_lib_prefix=no
2532 2590
   need_version=no
2533 2591
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -2543,7 +2601,7 @@ irix5* | irix6* | nonstopux*)
2543 2601
     nonstopux*) version_type=nonstopux ;;
2544 2602
     *)
2545 2603
 	if test "$lt_cv_prog_gnu_ld" = yes; then
2546  
-		version_type=linux
  2604
+		version_type=linux # correct to gnu/linux during the next big refactor
2547 2605
 	else
2548 2606
 		version_type=irix
2549 2607
 	fi ;;
@@ -2580,9 +2638,9 @@ linux*oldld* | linux*aout* | linux*coff*)
2580 2638
   dynamic_linker=no
2581 2639
   ;;
2582 2640
 
2583  
-# This must be Linux ELF.
  2641
+# This must be glibc/ELF.
2584 2642
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
2585  
-  version_type=linux
  2643
+  version_type=linux # correct to gnu/linux during the next big refactor
2586 2644
   need_lib_prefix=no
2587 2645
   need_version=no
2588 2646
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2657,7 +2715,7 @@ netbsd*)
2657 2715
   ;;
2658 2716
 
2659 2717
 newsos6)
2660  
-  version_type=linux
  2718
+  version_type=linux # correct to gnu/linux during the next big refactor
2661 2719
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
2662 2720
   shlibpath_var=LD_LIBRARY_PATH
2663 2721
   shlibpath_overrides_runpath=yes
@@ -2726,7 +2784,7 @@ rdos*)
2726 2784
   ;;
2727 2785
 
2728 2786
 solaris*)
2729  
-  version_type=linux
  2787
+  version_type=linux # correct to gnu/linux during the next big refactor
2730 2788
   need_lib_prefix=no
2731 2789
   need_version=no
2732 2790
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2751,7 +2809,7 @@ sunos4*)
2751 2809
   ;;
2752 2810
 
2753 2811
 sysv4 | sysv4.3*)
2754  
-  version_type=linux
  2812
+  version_type=linux # correct to gnu/linux during the next big refactor
2755 2813
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
2756 2814
   soname_spec='${libname}${release}${shared_ext}$major'
2757 2815
   shlibpath_var=LD_LIBRARY_PATH
@@ -2775,7 +2833,7 @@ sysv4 | sysv4.3*)
2775 2833
 
2776 2834
 sysv4*MP*)
2777 2835
   if test -d /usr/nec ;then
2778  
-    version_type=linux
  2836
+    version_type=linux # correct to gnu/linux during the next big refactor
2779 2837
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
2780 2838
     soname_spec='$libname${shared_ext}.$major'
2781 2839
     shlibpath_var=LD_LIBRARY_PATH
@@ -2806,7 +2864,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
2806 2864
 
2807 2865
 tpf*)
2808 2866
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
2809  
-  version_type=linux
  2867
+  version_type=linux # correct to gnu/linux during the next big refactor
2810 2868
   need_lib_prefix=no
2811 2869
   need_version=no
2812 2870
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2816,7 +2874,7 @@ tpf*)
2816 2874
   ;;
2817 2875
 
2818 2876
 uts4*)
2819  
-  version_type=linux
  2877
+  version_type=linux # correct to gnu/linux during the next big refactor
2820 2878
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
2821 2879
   soname_spec='${libname}${release}${shared_ext}$major'
2822 2880
   shlibpath_var=LD_LIBRARY_PATH
@@ -3238,7 +3296,7 @@ irix5* | irix6* | nonstopux*)
3238 3296
   lt_cv_deplibs_check_method=pass_all
3239 3297
   ;;
3240 3298
 
3241  
-# This must be Linux ELF.
  3299
+# This must be glibc/ELF.
3242 3300
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
3243 3301
   lt_cv_deplibs_check_method=pass_all
3244 3302
   ;;
@@ -3658,6 +3716,7 @@ for ac_symprfx in "" "_"; do
3658 3716
     # which start with @ or ?.
3659 3717
     lt_cv_sys_global_symbol_pipe="$AWK ['"\
3660 3718
 "     {last_section=section; section=\$ 3};"\
  3719
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
3661 3720
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
3662 3721
 "     \$ 0!~/External *\|/{next};"\
3663 3722
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -4242,7 +4301,9 @@ m4_if([$1], [CXX], [
4242 4301
     case $cc_basename in
4243 4302
     nvcc*) # Cuda Compiler Driver 2.2
4244 4303
       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
4245  
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
  4304
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
  4305
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
  4306
+      fi
4246 4307
       ;;
4247 4308
     esac
4248 4309
   else
@@ -4334,18 +4395,33 @@ m4_if([$1], [CXX], [
4334 4395
 	;;
4335 4396
       *)
4336 4397
 	case `$CC -V 2>&1 | sed 5q` in
4337  
-	*Sun\ F* | *Sun*Fortran*)
  4398
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
4338 4399
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
4339 4400
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
4340 4401
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
4341 4402
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
4342 4403
 	  ;;
  4404
+	*Sun\ F* | *Sun*Fortran*)
  4405
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  4406
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
  4407
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
  4408
+	  ;;
4343 4409
 	*Sun\ C*)
4344 4410
 	  # Sun C 5.9
4345 4411
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
4346 4412
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
4347 4413
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4348 4414
 	  ;;
  4415
+        *Intel*\ [[CF]]*Compiler*)
  4416
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
  4417
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
  4418
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
  4419
+	  ;;
  4420
+	*Portland\ Group*)
  4421
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
  4422
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
  4423
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
  4424
+	  ;;
4349 4425
 	esac
4350 4426
 	;;
4351 4427
       esac
@@ -4505,7 +4581,9 @@ m4_if([$1], [CXX], [
4505 4581
     ;;
4506 4582
   cygwin* | mingw* | cegcc*)
4507 4583
     case $cc_basename in
4508  
-    cl*) ;;
  4584
+    cl*)
  4585
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
  4586
+      ;;
4509 4587
     *)
4510 4588
       _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
4511 4589
       _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
@@ -4533,7 +4611,6 @@ m4_if([$1], [CXX], [
4533 4611
   _LT_TAGVAR(hardcode_direct, $1)=no
4534 4612
   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
4535 4613
   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
4536  
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
4537 4614
   _LT_TAGVAR(hardcode_libdir_separator, $1)=
4538 4615
   _LT_TAGVAR(hardcode_minus_L, $1)=no
4539 4616
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -4787,8 +4864,7 @@ _LT_EOF
4787 4864
 	xlf* | bgf* | bgxlf* | mpixlf*)
4788 4865
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
4789 4866
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
4790  
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
4791  
-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
  4867
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
4792 4868
 	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
4793 4869
 	  if test "x$supports_anon_versioning" = xyes; then
4794 4870
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
@@ -5084,6 +5160,7 @@ _LT_EOF
5084 5160
 	# The linker will not automatically build a static lib if we build a DLL.
5085 5161
 	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
5086 5162
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
  5163
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
5087 5164
 	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
5088 5165
 	# Don't use ranlib
5089 5166
 	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
@@ -5130,10 +5207,6 @@ _LT_EOF
5130 5207
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
5131 5208
       ;;
5132 5209
 
5133  
-    freebsd1*)
5134  
-      _LT_TAGVAR(ld_shlibs, $1)=no
5135  
-      ;;
5136  
-
5137 5210
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
5138 5211
     # support.  Future versions do this automatically, but an explicit c++rt0.o
5139 5212
     # does not break anything, and helps significantly (at the cost of a little
@@ -5146,7 +5219,7 @@ _LT_EOF
5146 5219
       ;;
5147 5220
 
5148 5221
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
5149  
-    freebsd2*)
  5222
+    freebsd2.*)
5150 5223
       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
5151 5224
       _LT_TAGVAR(hardcode_direct, $1)=yes
5152 5225
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5185,7 +5258,6 @@ _LT_EOF
5185 5258
       fi
5186 5259
       if test "$with_gnu_ld" = no; then
5187 5260
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
5188  
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
5189 5261
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
5190 5262
 	_LT_TAGVAR(hardcode_direct, $1)=yes
5191 5263
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -5627,9 +5699,6 @@ _LT_TAGDECL([], [no_undefined_flag], [1],
5627 5699
 _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
5628 5700
     [Flag to hardcode $libdir into a binary during linking.
5629 5701
     This must work even if $libdir does not exist])
5630  
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
5631  
-    [[If ld is used when linking, flag to hardcode $libdir into a binary
5632  
-    during linking.  This must work even if $libdir does not exist]])
5633 5702
 _LT_TAGDECL([], [hardcode_libdir_separator], [1],
5634 5703
     [Whether we need a single "-rpath" flag with a separated argument])
5635 5704
 _LT_TAGDECL([], [hardcode_direct], [0],
@@ -5787,7 +5856,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
5787 5856
 _LT_TAGVAR(hardcode_direct, $1)=no
5788 5857
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
5789 5858
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
5790  
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
5791 5859
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
5792 5860
 _LT_TAGVAR(hardcode_minus_L, $1)=no
5793 5861
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -6157,7 +6225,7 @@ if test "$_lt_caught_CXX_error" != yes; then
6157 6225
         esac
6158 6226
         ;;
6159 6227
 
6160  
-      freebsd[[12]]*)
  6228
+      freebsd2.*)
6161 6229
         # C++ shared libraries reported to be fairly broken before
6162 6230
 	# switch to ELF
6163 6231
         _LT_TAGVAR(ld_shlibs, $1)=no
@@ -6918,12 +6986,18 @@ public class foo {
6918 6986
   }
6919 6987
 };
6920 6988
 _LT_EOF
  6989
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
  6990
+package foo
  6991
+func foo() {
  6992
+}
  6993
+_LT_EOF
6921 6994
 ])
6922 6995
 
6923 6996
 _lt_libdeps_save_CFLAGS=$CFLAGS
6924 6997
 case "$CC $CFLAGS " in #(
6925 6998
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
6926 6999
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
  7000
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
6927 7001
 esac
6928 7002
 
6929 7003
 dnl Parse the compiler output and extract the necessary
@@ -7120,7 +7194,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
7120 7194
 _LT_TAGVAR(hardcode_direct, $1)=no
7121 7195
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
7122 7196
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
7123  
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
7124 7197
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
7125 7198
 _LT_TAGVAR(hardcode_minus_L, $1)=no
7126 7199
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7253,7 +7326,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
7253 7326
 _LT_TAGVAR(hardcode_direct, $1)=no
7254 7327
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
7255 7328
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
7256  
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
7257 7329
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
7258 7330
 _LT_TAGVAR(hardcode_minus_L, $1)=no
7259 7331
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7440,6 +7512,77 @@ CFLAGS=$lt_save_CFLAGS
7440 7512
 ])# _LT_LANG_GCJ_CONFIG
7441 7513
 
7442 7514
 
  7515
+# _LT_LANG_GO_CONFIG([TAG])
  7516
+# --------------------------
  7517
+# Ensure that the configuration variables for the GNU Go compiler
  7518
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
  7519
+# to write the compiler configuration to `libtool'.
  7520
+m4_defun([_LT_LANG_GO_CONFIG],
  7521
+[AC_REQUIRE([LT_PROG_GO])dnl
  7522
+AC_LANG_SAVE
  7523
+
  7524
+# Source file extension for Go test sources.
  7525
+ac_ext=go
  7526
+
  7527
+# Object file extension for compiled Go test sources.
  7528
+objext=o
  7529
+_LT_TAGVAR(objext, $1)=$objext
  7530
+
  7531
+# Code to be used in simple compile tests
  7532
+lt_simple_compile_test_code="package main; func main() { }"
  7533
+
  7534
+# Code to be used in simple link tests
  7535
+lt_simple_link_test_code='package main; func main() { }'
  7536
+
  7537
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
  7538
+_LT_TAG_COMPILER
  7539
+
  7540
+# save warnings/boilerplate of simple test code
  7541
+_LT_COMPILER_BOILERPLATE
  7542
+_LT_LINKER_BOILERPLATE
  7543
+
  7544
+# Allow CC to be a program name with arguments.
  7545
+lt_save_CC=$CC
  7546
+lt_save_CFLAGS=$CFLAGS
  7547
+lt_save_GCC=$GCC
  7548
+GCC=yes
  7549
+CC=${GOC-"gccgo"}
  7550
+CFLAGS=$GOFLAGS
  7551
+compiler=$CC
  7552
+_LT_TAGVAR(compiler, $1)=$CC
  7553
+_LT_TAGVAR(LD, $1)="$LD"
  7554
+_LT_CC_BASENAME([$compiler])
  7555
+
  7556
+# Go did not exist at the time GCC didn't implicitly link libc in.
  7557
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
  7558
+
  7559
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
  7560
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
  7561
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
  7562
+
  7563
+## CAVEAT EMPTOR:
  7564
+## There is no encapsulation within the following macros, do not change
  7565
+## the running order or otherwise move them around unless you know exactly
  7566
+## what you are doing...
  7567
+if test -n "$compiler"; then
  7568
+  _LT_COMPILER_NO_RTTI($1)
  7569
+  _LT_COMPILER_PIC($1)
  7570
+  _LT_COMPILER_C_O($1)
  7571
+  _LT_COMPILER_FILE_LOCKS($1)
  7572
+  _LT_LINKER_SHLIBS($1)
  7573
+  _LT_LINKER_HARDCODE_LIBPATH($1)
  7574
+
  7575
+  _LT_CONFIG($1)
  7576
+fi
  7577
+
  7578
+AC_LANG_RESTORE
  7579
+
  7580
+GCC=$lt_save_GCC
  7581
+CC=$lt_save_CC
  7582
+CFLAGS=$lt_save_CFLAGS
  7583
+])# _LT_LANG_GO_CONFIG
  7584
+
  7585
+
7443 7586
 # _LT_LANG_RC_CONFIG([TAG])
7444 7587
 # -------------------------
7445 7588
 # Ensure that the configuration variables for the Windows resource compiler
@@ -7509,6 +7652,13 @@ dnl aclocal-1.4 backwards compatibility:
7509 7652
 dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
7510 7653
 
7511 7654
 
  7655
+# LT_PROG_GO
  7656
+# ----------
  7657
+AC_DEFUN([LT_PROG_GO],
  7658
+[AC_CHECK_TOOL(GOC, gccgo,)
  7659
+])
  7660
+
  7661
+
7512 7662
 # LT_PROG_RC
7513 7663
 # ----------
7514 7664
 AC_DEFUN([LT_PROG_RC],
19  m4/ltoptions.m4
@@ -326,9 +326,24 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
326 326
 # MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
327 327
 m4_define([_LT_WITH_PIC],
328 328
 [AC_ARG_WITH([pic],
329  
-    [AS_HELP_STRING([--with-pic],
  329
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
330 330
 	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
331  
-    [pic_mode="$withval"],
  331
+    [lt_p=${PACKAGE-default}
  332
+    case $withval in
  333
+    yes|no) pic_mode=$withval ;;
  334
+    *)
  335
+      pic_mode=default
  336
+      # Look at the argument we got.  We use all the common list separators.
  337
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
  338
+      for lt_pkg in $withval; do
  339
+	IFS="$lt_save_ifs"
  340
+	if test "X$lt_pkg" = "X$lt_p"; then
  341
+	  pic_mode=yes
  342
+	fi
  343
+      done
  344
+      IFS="$lt_save_ifs"
  345
+      ;;
  346
+    esac],
332 347
     [pic_mode=default])
333 348
 
334 349
 test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
10  m4/ltversion.m4
@@ -9,15 +9,15 @@
9 9
 
10 10
 # @configure_input@
11 11
 
12  
-# serial 3293 ltversion.m4
  12
+# serial 3337 ltversion.m4
13 13
 # This file is part of GNU Libtool
14 14
 
15  
-m4_define([LT_PACKAGE_VERSION], [2.4])
16  
-m4_define([LT_PACKAGE_REVISION], [1.3293])
  15
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
  16
+m4_define([LT_PACKAGE_REVISION], [1.3337])
17 17
 
18 18
 AC_DEFUN([LTVERSION_VERSION],
19  
-[macro_version='2.4'
20  
-macro_revision='1.3293'
  19
+[macro_version='2.4.2'
  20
+macro_revision='1.3337'
21 21
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
22 22
 _LT_DECL(, macro_revision, 0)
23 23
 ])
2  po/Makefile.in
@@ -36,7 +36,7 @@ libdir = ${exec_prefix}/lib
36 36
 DATADIRNAME = share
37 37
 itlocaledir = $(prefix)/$(DATADIRNAME)/locale
38 38
 subdir = po
39  
-install_sh = ${SHELL} /home/poppa/src/ral2/install-sh
  39
+install_sh = ${SHELL} ${top_builddir}/install-sh
40 40
 # Automake >= 1.8 provides /bin/mkdir -p.
41 41
 # Until it can be supposed, use the safe fallback:
42 42
 mkdir_p = $(install_sh) -d
13  po/Makefile.in.in
@@ -49,8 +49,8 @@ MSGFMT = @MSGFMT@
49 49
 XGETTEXT = @XGETTEXT@
50 50
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
51 51
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
52  
-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
53  
-GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
  52
+MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
  53
+GENPOT   = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
54 54
 
55 55
 ALL_LINGUAS = @ALL_LINGUAS@
56 56
 
@@ -73,15 +73,20 @@ CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$l
73 73
 .SUFFIXES:
74 74
 .SUFFIXES: .po .pox .gmo .mo .msg .cat
75 75
 
  76
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
  77
+INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V))
  78
+INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY))
  79
+INTLTOOL__v_MSGFMT_0 = @echo "  MSGFMT" $@;
  80
+
76 81
 .po.pox:
77 82
 	$(MAKE) $(GETTEXT_PACKAGE).pot
78 83
 	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
79 84
 
80 85
 .po.mo:
81  
-	$(MSGFMT) -o $@ $<
  86
+	$(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
82 87
 
83 88
 .po.gmo:
84  
-	file=`echo $* | sed 's,.*/,,'`.gmo \
  89
+	$(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \
85 90
 	  && rm -f $$file && $(GMSGFMT) -o $$file $<
86 91
 
87 92
 .po.cat:
102  po/sv.po
@@ -2,8 +2,8 @@ msgid ""
2 2
 msgstr ""
3 3
 "Project-Id-Version: roxenlauncher 1.2\n"
4 4
 "Report-Msgid-Bugs-To: \n"
5  
-"POT-Creation-Date: 2012-03-22 22:54+0100\n"
6  
-"PO-Revision-Date: 2012-03-22 22:56+0100\n"
  5
+"POT-Creation-Date: 2012-05-10 07:00+0100\n"
  6
+"PO-Revision-Date: 2012-05-10 07:02+0100\n"
7 7
 "Last-Translator: Pontus Östlund <pontus@poppa.se>\n"
8 8
 "Language-Team: Swedish <pontus@poppa.se>\n"
9 9
 "Language: sv\n"
@@ -18,33 +18,33 @@ msgstr ""
18 18
 "X-Poedit-SearchPath-0: src\n"
19 19
 "X-Poedit-SearchPath-1: data\n"
20 20
 
21  
-#: src/roxelauncher.c:183
  21
+#: src/roxelauncher.c:190
22 22
 #: src/main.c:103
23  
-#: src/mainwindow.c:4005
  23
+#: src/mainwindow.c:4011
24 24
 msgid "Roxen™ Application Launcher"
25 25
 msgstr "Roxen™ Programstartare"
26 26
 
27  
-#: src/roxelauncher.c:770
28  
-#: src/roxelauncher.c:806
  27
+#: src/roxelauncher.c:775
  28
+#: src/roxelauncher.c:811
29 29
 #, c-format
30 30
 msgid "Unable to create local directory \"%s\""
31 31
 msgstr "Kunde inte skapa lokal katalog \"%s\""
32 32
 
33  
-#: src/roxelauncher.c:1284
  33
+#: src/roxelauncher.c:1289
34 34
 #, c-format
35 35
 msgid "Creating log file %s"
36 36
 msgstr "Skapar loggfil %s"
37 37
 
38  
-#: src/roxelauncher.c:1345
  38
+#: src/roxelauncher.c:1350
39 39
 msgid "Unable to load log file contents"
40 40
 msgstr "Kunde inte ladda in loggfil: %s"
41 41
 
42  
-#: src/roxelauncher.c:1441
  42
+#: src/roxelauncher.c:1493
43 43
 #, c-format
44 44
 msgid "Unable to write to logfile %s: %s"
45 45
 msgstr "Kunde inte skriva till loggfil %s: %s"
46 46
 
47  
-#: src/roxelauncher.c:1498
  47
+#: src/roxelauncher.c:1548
48 48
 #, c-format
49 49
 msgid "Unable to truncate log file %s: %s"
50 50
 msgstr "Kunde inte rensa loggfil %s: %s"
@@ -53,20 +53,20 @@ msgstr "Kunde inte rensa loggfil %s: %s"
53 53
 msgid "Application launcher started"
54 54
 msgstr "Programstartaren startad"
55 55
 
56  
-#: src/main.c:374
  56
+#: src/main.c:377
57 57
 #, c-format
58 58
 msgid "Failed to handle incomming file: %s"
59 59
 msgstr "Kunde inte hantera inkommande fil: %s"
60 60
 
61  
-#: src/main.c:524
  61
+#: src/main.c:527
62 62
 msgid " [FILE]"
63 63
 msgstr " [FIL]"
64 64
 
65  
-#: src/main.c:575
  65
+#: src/main.c:578
66 66
 msgid "Version"
67 67
 msgstr "Version"
68 68
 
69  
-#: src/main.c:593
  69
+#: src/main.c:596
70 70
 msgid "Antoher instance of Roxen Application Launcher is already running"
71 71
 msgstr "En annan instans av Roxen Programstartare körs redan"
72 72
 
@@ -88,7 +88,7 @@ msgstr "Senast uppladdad"
88 88
 
89 89
 #: src/mainwindow.c:1492
90 90
 #: src/mainwindow.c:2234
91  
-#: src/launcherfile.c:1335
  91
+#: src/launcherfile.c:1444
92 92
 msgid "Not uploaded"
93 93
 msgstr "Ej uppladdad"
94 94
 
@@ -117,142 +117,147 @@ msgstr "Lägg till filtyp"
117 117
 msgid "Edit content type"
118 118
 msgstr "Redigera filtyp"
119 119
 
120  
-#: src/mainwindow.c:3667
  120
+#: src/mainwindow.c:3675
121 121
 msgid "No files"
122 122
 msgstr "Inga filer"
123 123
 
124  
-#: src/mainwindow.c:3677
  124
+#: src/mainwindow.c:3685
125 125
 msgid "One file"
126 126
 msgstr "En fil"
127 127
 
128  
-#: src/mainwindow.c:3685
  128
+#: src/mainwindow.c:3693
129 129
 #, c-format
130 130
 msgid "%d active files"
131 131
 msgstr "%d aktiva filer"
132 132
 
133  
-#: src/launcherfile.c:711
  133
+#: src/launcherfile.c:723
134 134
 msgid "Bad data in launcher file!"
135 135
 msgstr "Felaktigt innehåll i filen"
136 136
 
137  
-#: src/launcherfile.c:1305
  137
+#: src/launcherfile.c:1414
138 138
 msgid "Not downloaded"
139 139
 msgstr "Ej nerladdad"
140 140
 
141  
-#: src/launcherfile.c:1315
  141
+#: src/launcherfile.c:1424
142 142
 msgid "Downloaded"
143 143
 msgstr "Nerladdad"
144 144
 
145  
-#: src/launcherfile.c:1325
  145
+#: src/launcherfile.c:1434
146 146
 msgid "Uploaded"
147 147
 msgstr "Uppladdad"
148 148
 
149  
-#: src/launcherfile.c:1345
  149
+#: src/launcherfile.c:1454
150 150
 msgid "Downloading..."
151 151
 msgstr "Laddar ner..."
152 152
 
153  
-#: src/launcherfile.c:1355
  153
+#: src/launcherfile.c:1464
154 154
 msgid "Uploading..."
155 155
 msgstr "Laddar upp..."
156 156
 
157  
-#: src/launcherfile.c:1365
  157
+#: src/launcherfile.c:1474
158 158
 msgid "Not changed"
159 159
 msgstr "Ej ändrad"
160 160
 
161  
-#: src/launcherfile.c:2048
  161
+#: src/launcherfile.c:2169
162 162
 msgid "Error starting editor"
163 163
 msgstr "Kunde inte starta redigerare"
164 164
 
165  
-#: src/launcherfile.c:2049
  165
+#: src/launcherfile.c:2170
  166
+#: src/launcherfile.c:2182
166 167
 #, c-format
167 168
 msgid "Could not start editor %s: %s "
168 169
 msgstr "Kunde inte starta redigerare %s: %s"
169 170
 
170  
-#: src/launcherfile.c:2138
  171
+#: src/launcherfile.c:2271
171 172
 #, c-format
172 173
 msgid "Downloading file: %s"
173 174
 msgstr "Laddar ner fil: %s"
174 175
 
175  
-#: src/launcherfile.c:2228
  176
+#: src/launcherfile.c:2353
  177
+msgid "Download failed"
  178
+msgstr "Hämtningen misslyckades"
  179
+
  180
+#: src/launcherfile.c:2409
176 181
 msgid "Download OK"
177 182
 msgstr "Hämtningen lyckades"
178 183
 
179  
-#: src/launcherfile.c:2229
  184
+#: src/launcherfile.c:2410
180 185
 #, c-format
181 186
 msgid "%s was downloaded OK from %s"
182 187
 msgstr "%s laddades ner OK från %s"
183 188
 
184  
-#: src/launcherfile.c:2284
  189
+#: src/launcherfile.c:2470
185 190
 #, c-format
186 191
 msgid "Requested file %s not found on %s"
187 192
 msgstr "Den efterfrågde filen %s hittades inte på %s"
188 193
 
189  
-#: src/launcherfile.c:2298
  194
+#: src/launcherfile.c:2484
190 195
 #, c-format
191 196
 msgid "%s was not downloaded from %s"
192 197
 msgstr "%s laddades inte ner från %s"
193 198
 
194  
-#: src/launcherfile.c:2421
  199
+#: src/launcherfile.c:2611
195 200
 #, c-format
196 201
 msgid "Unable to write to file %s: %s"
197 202
 msgstr "Kunde inte skriva till fil %s: %s"
198 203
 
199  
-#: src/launcherfile.c:2520
  204
+#: src/launcherfile.c:2710
200 205
 #, c-format
201 206
 msgid "Uploading %s"
202 207
 msgstr "Laddar upp %s"
203 208
 
204  
-#: src/launcherfile.c:2634
  209
+#: src/launcherfile.c:2824
205 210
 #, c-format
206 211
 msgid "Unable to upload file: %s"
207 212
 msgstr "Kunde inte ladda upp fil: %s"
208 213
 
209  
-#: src/launcherfile.c:2645
  214
+#: src/launcherfile.c:2835
210 215
 msgid "Upload failed"
211 216
 msgstr "Uppladdningen misslyckades"
212 217
 
213  
-#: src/launcherfile.c:2647
  218
+#: src/launcherfile.c:2837
214 219
 #, c-format
215 220
 msgid "%s was not uploaded OK to %s"
216 221
 msgstr "%s laddades inte upp OK till %s"
217 222
 
218  
-#: src/launcherfile.c:2692
  223
+#: src/launcherfile.c:2882
219 224
 msgid "Upload OK"
220 225
 msgstr "Uppladdningen lyckades"
221 226
 
222  
-#: src/launcherfile.c:2693
  227
+#: src/launcherfile.c:2883