Merge lp:~noskcaj/ubuntu/trusty/xfce4-clipman-plugin/1.2.4 into lp:ubuntu/trusty/xfce4-clipman-plugin

[Jackson Doak]

Merge from debian

[Logan Rosen (logan)]

I synced. Make sure to check the delta in the future to make sure it's still necessary (and check the diff in Debian). There were config.{sub,guess} updates upstream.

review: Disapprove

Unmerged revisions

22. By Jackson Doak on 2014-02-06

update maintainer

21. By Jackson Doak on 2014-02-06

* Merge from debian. Remaining changes:
  - Use dh_autotools-dev to update config.{sub,guess} for AArch64.
* Correct Vcs-* URLs to point to anonscm.debian.org
* New upstream release.
* debian/xfce4-clipman.install:
  - drop /usr/share/doc, documentation has been removed from upstream
    package.
* debian/control:
  - update standards version to 3.9.5.
* debian/rules:
  - disable silent rules.

=== modified file 'ChangeLog'
--- ChangeLog	2012-04-09 21:26:50 +0000
+++ ChangeLog	2014-02-06 05:26:15 +0000
@@ -1,3 +1,23 @@
[phone]	Mike Massonnet
+=== Release 1.2.4 ===
+
[phone]  Mike Massonnet
+Remove doc submodule
+
[phone]  Mike Massonnet
+Bug #10667: define different menmonic
+
[phone]  Christian Hesse
+Bug #9528: QR-code encoder
+
+    Optional build, requires libqrencode >= 3.3.
+
[phone]  Mike Massonnet
+Bug #9896: move Disable item inside context/right-click menu
+
[phone]  Mike Massonnet
+Bug #10506: allow skipping actions by pressing or not CTRL
+
 2012-04-09	Mike Massonnet
 === Release 1.2.3 ===
 

=== modified file 'Makefile.am'
--- Makefile.am	2012-04-09 21:26:50 +0000
+++ Makefile.am	2014-02-06 05:26:15 +0000
@@ -6,16 +6,11 @@
 	panel-plugin							\
 	tests								\
 	po								\
-	doc								\
 	$(NULL)
 
 distclean-local:
 	rm -rf *.cache *~
 
-DISTCHECK_CONFIGURE_FLAGS =						\
-	--enable-gen-doc						\
-	$(NULL)
-
 EXTRA_DIST =								\
 	AUTHORS								\
 	ChangeLog							\

=== modified file 'Makefile.in'
--- Makefile.in	2012-04-09 21:26:50 +0000
+++ Makefile.in	2014-02-06 05:26:15 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15,6 +15,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -65,6 +82,11 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -161,11 +183,6 @@
 GLIB_VERSION = @GLIB_VERSION@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GNOME_DOC_TOOL = @GNOME_DOC_TOOL@
-GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
-GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
-GNOME_DOC_UTILS_REQUIRED_VERSION = @GNOME_DOC_UTILS_REQUIRED_VERSION@
-GNOME_DOC_UTILS_VERSION = @GNOME_DOC_UTILS_VERSION@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -186,7 +203,6 @@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-ITSTOOL = @ITSTOOL@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -247,6 +263,10 @@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+QRENCODE_CFLAGS = @QRENCODE_CFLAGS@
+QRENCODE_LIBS = @QRENCODE_LIBS@
+QRENCODE_REQUIRED_VERSION = @QRENCODE_REQUIRED_VERSION@
+QRENCODE_VERSION = @QRENCODE_VERSION@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -334,11 +354,6 @@
 	panel-plugin							\
 	tests								\
 	po								\
-	doc								\
-	$(NULL)
-
-DISTCHECK_CONFIGURE_FLAGS = \
-	--enable-gen-doc						\
 	$(NULL)
 
 EXTRA_DIST = \
@@ -606,13 +621,10 @@
 	done
 	@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 \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -697,7 +709,7 @@
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	chmod -R a-w $(distdir); chmod u+w $(distdir)
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)

=== modified file 'NEWS'
--- NEWS	2012-04-09 21:26:50 +0000
+++ NEWS	2014-02-06 05:26:15 +0000
@@ -1,3 +1,11 @@
+Version 1.2.4 - 2014-02-02
+
+- Removed doc submodule
+- Bug 10667: Define different menmonic
+- Bug 9528: QR-code encoder
+- Bug 9896: Move Disable item inside context/right-click menu
+- Bug 10506: Allow skipping actions by pressing or not CTRL
+
 Version 1.2.3 - 2012-04-09
 
 - Use new online documentation location http://docs.xfce.org/

=== modified file 'README'
--- README	2011-11-01 18:47:59 +0000
+++ README	2014-02-06 05:26:15 +0000
@@ -29,6 +29,7 @@
  Optional
 
 * unique-1.0 1.0
+* libqrencode3 3.3
 
  Install
 ---------

=== modified file 'aclocal.m4'
--- aclocal.m4	2012-04-09 21:26:50 +0000
+++ aclocal.m4	2014-02-06 05:26:15 +0000
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
@@ -14,8 +14,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -459,7 +459,7 @@
 
 
 dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 41 IT_PROG_INTLTOOL
+# serial 42 IT_PROG_INTLTOOL
 AC_DEFUN([IT_PROG_INTLTOOL], [
 AC_PREREQ([2.50])dnl
 AC_REQUIRE([AM_NLS])dnl
@@ -472,13 +472,11 @@
     ;;
 esac
 
+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
 if test -n "$1"; then
     AC_MSG_CHECKING([for intltool >= $1])
-
-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-    [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    ]
     AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
     test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
 	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
@@ -521,7 +519,11 @@
 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 $< [$]@' 
        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 $< [$]@' 
       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 $< [$]@' 
+if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
       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 $< [$]@'
+else
+      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'
+fi
       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 $< [$]@' 
       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 $< [$]@' 
     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 $< [$]@' 
@@ -3176,17 +3178,6 @@
   esac
   ;;
 
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  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
-  ;;
-
 haiku*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
@@ -3303,7 +3294,7 @@
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
@@ -3348,6 +3339,18 @@
   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
@@ -3907,10 +3910,6 @@
   fi
   ;;
 
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -3949,11 +3948,11 @@
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd*)
+netbsd* | netbsdelf*-gnu)
   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
@@ -4701,7 +4700,7 @@
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -4765,7 +4764,7 @@
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | netbsdelf*-gnu)
 	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -5000,7 +4999,7 @@
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -5242,6 +5241,9 @@
       ;;
     esac
     ;;
+  linux* | k*bsd*-gnu | 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'
     ;;
@@ -5304,6 +5306,9 @@
   openbsd*)
     with_gnu_ld=no
     ;;
+  linux* | k*bsd*-gnu | gnu*)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+    ;;
   esac
 
   _LT_TAGVAR(ld_shlibs, $1)=yes
@@ -5525,7 +5530,7 @@
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -5702,6 +5707,7 @@
 	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
@@ -6006,7 +6012,7 @@
       _LT_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       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
@@ -6882,9 +6888,6 @@
         _LT_TAGVAR(ld_shlibs, $1)=yes
         ;;
 
-      gnu*)
-        ;;
-
       haiku*)
         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
         _LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -7046,7 +7049,7 @@
         _LT_TAGVAR(inherit_rpath, $1)=yes
         ;;
 
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
         case $cc_basename in
           KCC*)
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -9468,7 +9471,7 @@
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.3], [],
+m4_if([$1], [1.11.6], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -9484,7 +9487,7 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.3])dnl
+[AM_AUTOMAKE_VERSION([1.11.6])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -9846,18 +9849,6 @@
      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
 # Do all the work for Automake.                             -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -10747,30 +10738,6 @@
 
 
 
-dnl BM_DEPEND(varname, package, version)
-dnl
-dnl Simple wrapper for XDT_CHECK_PACKAGE("varname", "package", "version"). Kept
-dnl for backward compatibility. Will be removed in the future.
-dnl
-AC_DEFUN([BM_DEPEND],
-[
-  XDT_CHECK_PACKAGE([$1], [$2], [$3])
-])
-
-
-
-dnl BM_DEPEND_CHECK(var, pkg, version, name, helpstring, default)
-dnl
-dnl Simple wrapper for XDT_CHECK_OPTIONAL_PACKAGE(). Kept for backward
-dnl compatibility. Will be removed in the future.
-dnl
-AC_DEFUN([BM_DEPEND_CHECK],
-[
-  XDT_CHECK_OPTIONAL_PACKAGE([$1], [$2], [$3], [$4], [$5], [$6])
-])
-
-
-
 dnl XDT_CHECK_LIBX11()
 dnl
 dnl Executes various checks for X11. Sets LIBX11_CFLAGS, LIBX11_LDFLAGS
@@ -10907,66 +10874,6 @@
 ])
 
 
-
-dnl BM_LIBX11()
-dnl
-dnl Simple wrapper for XDT_CHECK_LIBX11. Kept for backward
-dnl compatibility. Will be removed in the future.
-dnl
-AC_DEFUN([BM_LIBX11],
-[
-  AC_REQUIRE([XDT_CHECK_LIBX11])
-])
-
-
-
-dnl BM_LIBX11_REQUIRE()
-dnl
-dnl Simple wrapper for XDT_CHECK_LIBX11_REQUIRE. Kept for backward
-dnl compatibility. Will be removed in the future.
-dnl
-AC_DEFUN([BM_LIBX11_REQUIRE],
-[
-  AC_REQUIRE([XDT_CHECK_LIBX11_REQUIRE])
-])
-
-
-
-dnl BM_LIBSM()
-dnl
-dnl Simple wrapper for XDT_CHECK_LIBSM. Kept for backward
-dnl compatibility. Will be removed in the future.
-dnl
-AC_DEFUN([BM_LIBSM],
-[
-  AC_REQUIRE([XDT_CHECK_LIBSM])
-])
-
-
-
-dnl BM_LIBXPM
-dnl
-dnl Simple wrapper for XDT_CHECK_LIBXPM. Kept for backward
-dnl compatibility. Will be removed in the future.
-dnl
-AC_DEFUN([BM_LIBXPM],
-[
-  AC_REQUIRE([XDT_CHECK_LIBXPM])
-])
-
-
-
-dnl BM_LIBXPM_REQUIRE
-dnl
-dnl Simple wrapper for XDT_CHECK_LIBXPM_REQUIRE. Kept for
-dnl backward compatibility. Will be removed in the future.
-dnl
-AC_DEFUN([BM_LIBXPM_REQUIRE],
-[
-  AC_REQUIRE([XDT_CHECK_LIBXPM_REQUIRE])
-])
-
-
 dnl $Id$
 dnl
 dnl Copyright (c) 2002-2006
@@ -11011,7 +10918,7 @@
     AC_MSG_CHECKING([if $CC supports $flag])
     saved_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS $flag"
-    AC_COMPILE_IFELSE([ ], [flag_supported=yes], [flag_supported=no])
+    AC_COMPILE_IFELSE([AC_LANG_SOURCE([ ])], [flag_supported=yes], [flag_supported=no])
     CFLAGS="$saved_CFLAGS"
     AC_MSG_RESULT([$flag_supported])
 
@@ -11048,7 +10955,7 @@
                               -Wcast-align -Wformat-security \
                               -Winit-self -Wmissing-include-dirs -Wundef \
                               -Wmissing-format-attribute -Wnested-externs"
-    CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
+    CPPFLAGS="$CPPFLAGS"
 
     if test x`uname` = x"Linux"; then
       xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector"
@@ -11088,7 +10995,7 @@
     CPPFLAGS="$CPPFLAGS -DNDEBUG"
 
     if test x"$enable_debug" = x"no"; then
-      CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
+      CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT"
       AC_MSG_RESULT([no])
     else
       AC_MSG_RESULT([minimum])
@@ -11115,7 +11022,7 @@
     saved_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS $xdt_vis_test_cflags"
     AC_MSG_CHECKING([whether $CC supports the GNUC visibility attribute])
-    AC_COMPILE_IFELSE(AC_LANG_SOURCE(
+    AC_COMPILE_IFELSE([AC_LANG_SOURCE(
     [
       void test_default (void);
       void test_hidden (void);
@@ -11128,7 +11035,7 @@
         test_hidden ();
         return 0;
       }
-    ]),
+    ])],
     [
       have_gnuc_visibility=yes
       AC_MSG_RESULT([yes])
@@ -11189,84 +11096,6 @@
   fi
 ])
 
-dnl BM_DEBUG_SUPPORT()
-dnl
-AC_DEFUN([BM_DEBUG_SUPPORT],
-[
-dnl # --enable-debug
-  AC_REQUIRE([XDT_FEATURE_DEBUG])
-
-dnl # --enable-profiling
-  AC_ARG_ENABLE([profiling],
-AC_HELP_STRING([--enable-profiling],
-    [Generate extra code to write profile information])
-AC_HELP_STRING([--disable-profiling],
-    [No extra code for profiling (default)]),
-    [], [enable_profiling=no])
-
-  AC_MSG_CHECKING([whether to build with profiling support])
-  if test x"$enable_profiling" != x"no"; then
-    CFLAGS="$CFLAGS -pg"
-    LDFLAGS="$LDFLAGS -pg"
-    AC_MSG_RESULT([yes])
-  else
-    AC_MSG_RESULT([no])
-  fi
-
-dnl # --enable-gcov
-  AC_ARG_ENABLE([gcov],
-AC_HELP_STRING([--enable-gcov],
-    [compile with coverage profiling instrumentation (gcc only)])
-AC_HELP_STRING([--disable-gcov],
-    [do not generate coverage profiling instrumentation (default)]),
-    [], [enable_gcov=no])
-
-  AC_MSG_CHECKING([whether to compile with coverage profiling instrumentation])
-  if test x"$enable_gcov" != x"no"; then
-    CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
-    AC_MSG_RESULT([yes])
-  else
-    AC_MSG_RESULT([no])
-  fi
-
-dnl # --disable-asserts
-  AC_ARG_ENABLE([asserts],
-AC_HELP_STRING([--disable-asserts], [Disable assertions [DANGEROUS]]),
-    [], [enable_asserts=yes])
-
-  AC_MSG_CHECKING([whether to disable assertions])
-  if test x"$enable_asserts" = x"no"; then
-    AC_MSG_RESULT([yes])
-    CPPFLAGS="$CPPFLAGS -DG_DISABLE_CHECKS -DG_DISABLE_ASSERT"
-    CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS"
-  else
-    AC_MSG_RESULT([no])
-  fi
-
-dnl # --enable-final
-  AC_REQUIRE([AC_PROG_LD])
-  AC_ARG_ENABLE([final],
-AC_HELP_STRING([--enable-final], [Build final version]),
-    [], [enable_final=yes])
-
-  AC_MSG_CHECKING([whether to build final version])
-  if test x"$enable_final" = x"yes"; then
-    AC_MSG_RESULT([yes])
-    AC_MSG_CHECKING([whether $LD accepts -O1])
-    case `$LD -O1 -v 2>&1 </dev/null` in
-    *GNU* | *'with BFD'*)
-      LDFLAGS="$LDFLAGS -Wl,-O1"
-      AC_MSG_RESULT([yes])
-    	;;
-    *)
-      AC_MSG_RESULT([no])
-    	;;
-    esac
-  else
-    AC_MSG_RESULT([no])
-  fi
-])
-
 dnl $Id$
 dnl
 dnl Copyright (c) 2002-2006
@@ -11345,16 +11174,3 @@
 ])
 
 
-
-dnl BM_I18N(PACKAGE, LINGUAS)
-dnl
-dnl Simple wrapper for XDT_I18N(LINGUAS, PACKAGE). Kept for
-dnl backward compatibility. Will be removed in the
-dnl future.
-dnl
-AC_DEFUN([BM_I18N],
-[
-  XDT_I18N([$2], [$1])
-])
-
-

=== modified file 'compile'
--- compile	2012-04-09 21:26:50 +0000
+++ compile	2014-02-06 05:26:15 +0000
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-01-04.17; # UTC
+scriptversion=2012-03-05.13; # UTC
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
 # Software Foundation, Inc.
@@ -79,6 +79,48 @@
   esac
 }
 
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
 # func_cl_wrapper cl arg...
 # Adjust compile command to suit cl
 func_cl_wrapper ()
@@ -109,43 +151,34 @@
 	      ;;
 	  esac
 	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
 	-I*)
 	  func_file_conv "${1#-I}" mingw
 	  set x "$@" -I"$file"
 	  shift
 	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
 	-l*)
-	  lib=${1#-l}
-	  found=no
-	  save_IFS=$IFS
-	  IFS=';'
-	  for dir in $lib_path $LIB
-	  do
-	    IFS=$save_IFS
-	    if $shared && test -f "$dir/$lib.dll.lib"; then
-	      found=yes
-	      set x "$@" "$dir/$lib.dll.lib"
-	      break
-	    fi
-	    if test -f "$dir/$lib.lib"; then
-	      found=yes
-	      set x "$@" "$dir/$lib.lib"
-	      break
-	    fi
-	  done
-	  IFS=$save_IFS
-
-	  test "$found" != yes && set x "$@" "$lib.lib"
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
 	  shift
 	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
 	-L*)
-	  func_file_conv "${1#-L}"
-	  if test -z "$lib_path"; then
-	    lib_path=$file
-	  else
-	    lib_path="$lib_path;$file"
-	  fi
-	  linker_opts="$linker_opts -LIBPATH:$file"
+	  func_cl_dashL "${1#-L}"
 	  ;;
 	-static)
 	  shared=false

=== modified file 'config.guess'
--- config.guess	2012-04-09 21:26:50 +0000
+++ config.guess	2014-02-06 05:26:15 +0000
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2012-01-01'
+timestamp='2012-02-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -863,6 +861,13 @@
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -1320,6 +1325,9 @@
     i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2

=== modified file 'config.h.in'
--- config.h.in	2011-11-01 18:47:59 +0000
+++ config.h.in	2014-02-06 05:26:15 +0000
@@ -39,6 +39,9 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
+/* Define if libqrencode >= 3.3.0 present */
+#undef HAVE_QRENCODE
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 

=== modified file 'config.sub'
--- config.sub	2012-04-09 21:26:50 +0000
+++ config.sub	2014-02-06 05:26:15 +0000
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2012-01-01'
+timestamp='2012-04-18'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,9 +21,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -132,6 +130,10 @@
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
@@ -223,6 +225,12 @@
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
 	-lynx*)
 		os=-lynxos
 		;;
@@ -247,6 +255,7 @@
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
+	| aarch64 | aarch64_be \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
@@ -319,7 +328,7 @@
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -332,7 +341,10 @@
 	strongarm | thumb | xscale)
 		basic_machine=arm-unknown
 		;;
-
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
 	xscaleeb)
 		basic_machine=armeb-unknown
 		;;
@@ -355,6 +367,7 @@
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
+	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
@@ -1530,6 +1543,9 @@
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	hexagon-*)
+		os=-elf
+		;;
 	tic54x-*)
 		os=-coff
 		;;

=== modified file 'configure'
--- configure	2012-04-09 21:26:50 +0000
+++ configure	2014-02-06 05:26:15 +0000
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac b04de51.
+# From configure.ac 130aa64.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for Clipman 1.2.3.
+# Generated by GNU Autoconf 2.69 for Clipman 1.2.4.
 #
 # Report bugs to <http://bugzilla.xfce.org/>.
 #
@@ -9,9 +9,7 @@
 #         The Xfce development team. All rights reserved.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -140,6 +138,31 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -173,7 +196,8 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -226,21 +250,25 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -343,6 +371,14 @@
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -464,6 +500,10 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -498,16 +538,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -519,28 +559,8 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -574,8 +594,8 @@
 # Identity of this package.
 PACKAGE_NAME='Clipman'
 PACKAGE_TARNAME='xfce4-clipman-plugin'
-PACKAGE_VERSION='1.2.3'
-PACKAGE_STRING='Clipman 1.2.3'
+PACKAGE_VERSION='1.2.4'
+PACKAGE_STRING='Clipman 1.2.4'
 PACKAGE_BUGREPORT='http://bugzilla.xfce.org/'
 PACKAGE_URL='http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin'
 
@@ -632,14 +652,12 @@
 CATALOGS
 MSGFMT_OPTS
 GETTEXT_PACKAGE
-GENERATE_DOCUMENTATION_FALSE
-GENERATE_DOCUMENTATION_TRUE
-GNOME_DOC_TOOL
-ITSTOOL
-GNOME_DOC_UTILS_REQUIRED_VERSION
-GNOME_DOC_UTILS_LIBS
-GNOME_DOC_UTILS_CFLAGS
-GNOME_DOC_UTILS_VERSION
+HAVE_QRENCODE_FALSE
+HAVE_QRENCODE_TRUE
+QRENCODE_REQUIRED_VERSION
+QRENCODE_LIBS
+QRENCODE_CFLAGS
+QRENCODE_VERSION
 HAVE_UNIQUE_FALSE
 HAVE_UNIQUE_TRUE
 UNIQUE_REQUIRED_VERSION
@@ -872,7 +890,7 @@
 enable_nls
 with_x
 enable_unique
-enable_gen_doc
+enable_libqrencode
 with_locales_dir
 enable_debug
 '
@@ -1344,8 +1362,6 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1431,7 +1447,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Clipman 1.2.3 to adapt to many kinds of systems.
+\`configure' configures Clipman 1.2.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1507,7 +1523,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Clipman 1.2.3:";;
+     short | recursive ) echo "Configuration of Clipman 1.2.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1530,8 +1546,9 @@
   --enable-unique         Enable checking for Unique support
                           (default=[])
   --disable-unique        Disable checking for Unique support
-  --enable-gen-doc        Generate HTML documentation (requires
-                          gnome-doc-utils) [default=no]
+  --enable-libqrencode    Enable checking for QR Code support
+                          (default=[])
+  --disable-libqrencode   Disable checking for QR Code support
   --enable-debug[=no|minimum|yes|full]
                           Build with debugging support [default=[]]
   --disable-debug         Include no debugging support
@@ -1632,10 +1649,10 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Clipman configure 1.2.3
-generated by GNU Autoconf 2.68
+Clipman configure 1.2.4
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
@@ -1714,7 +1731,7 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -2004,8 +2021,8 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Clipman $as_me 1.2.3, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+It was created by Clipman $as_me 1.2.4, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -2352,6 +2369,8 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
+ac_config_headers="$ac_config_headers config.h"
+
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2533,7 +2552,7 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -2702,7 +2721,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2742,7 +2761,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2793,7 +2812,7 @@
   test -z "$as_dir" && as_dir=.
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir (GNU coreutils) '* | \
 	     'mkdir (coreutils) '* | \
@@ -2846,7 +2865,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2932,7 +2951,7 @@
 
 # Define the identity of the package.
  PACKAGE='xfce4-clipman-plugin'
- VERSION='1.2.3'
+ VERSION='1.2.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2972,8 +2991,6 @@
 
 
 
-ac_config_headers="$ac_config_headers config.h"
-
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
@@ -3217,7 +3234,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3257,7 +3274,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3310,7 +3327,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3351,7 +3368,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -3409,7 +3426,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3453,7 +3470,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3899,8 +3916,7 @@
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -4135,7 +4151,7 @@
     for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+      as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
@@ -4211,7 +4227,7 @@
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -4277,7 +4293,7 @@
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -4344,7 +4360,7 @@
     for ac_prog in fgrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+      as_fn_executable_p "$ac_path_FGREP" || continue
 # Check for GNU ac_path_FGREP and select it if it is found.
   # Check for GNU $ac_path_FGREP
 case `"$ac_path_FGREP" --version 2>&1` in
@@ -4600,7 +4616,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4644,7 +4660,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5068,7 +5084,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5108,7 +5124,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5234,10 +5250,6 @@
   fi
   ;;
 
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -5276,11 +5288,11 @@
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd*)
+netbsd* | netbsdelf*-gnu)
   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
@@ -5414,7 +5426,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5454,7 +5466,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5558,7 +5570,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5602,7 +5614,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5727,7 +5739,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5767,7 +5779,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5826,7 +5838,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5866,7 +5878,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6515,7 +6527,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6555,7 +6567,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6635,7 +6647,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6675,7 +6687,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6727,7 +6739,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6767,7 +6779,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6819,7 +6831,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6859,7 +6871,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_LIPO="lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6911,7 +6923,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6951,7 +6963,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL="otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7003,7 +7015,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7043,7 +7055,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8198,7 +8210,7 @@
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -8676,6 +8688,9 @@
   openbsd*)
     with_gnu_ld=no
     ;;
+  linux* | k*bsd*-gnu | gnu*)
+    link_all_deplibs=no
+    ;;
   esac
 
   ld_shlibs=yes
@@ -8897,7 +8912,7 @@
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -9074,6 +9089,7 @@
 	if test "$aix_use_runtimelinking" = yes; then
 	  shared_flag="$shared_flag "'${wl}-G'
 	fi
+	link_all_deplibs=no
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -9527,7 +9543,7 @@
       link_all_deplibs=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -10364,17 +10380,6 @@
   esac
   ;;
 
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  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
-  ;;
-
 haiku*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
@@ -10491,7 +10496,7 @@
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
@@ -10555,6 +10560,18 @@
   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
@@ -11548,7 +11565,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -11588,7 +11605,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -11641,7 +11658,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -11682,7 +11699,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -11740,7 +11757,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -11784,7 +11801,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -11980,8 +11997,7 @@
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -12455,14 +12471,12 @@
     ;;
 esac
 
+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo  | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
 if test -n ""; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= " >&5
 $as_echo_n "checking for intltool >= ... " >&6; }
-
-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo  | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-    INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
     test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
@@ -12487,7 +12501,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -12527,7 +12541,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -12567,7 +12581,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -12623,7 +12637,11 @@
 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 $< $@'
        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 $< $@'
       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 $< $@'
+if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
       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 $< $@'
+else
+      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'
+fi
       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 $< $@'
       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 $< $@'
     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 $< $@'
@@ -12747,7 +12765,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -12787,7 +12805,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -12827,7 +12845,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -12867,7 +12885,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -12918,7 +12936,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -13910,7 +13928,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -13953,7 +13971,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -14105,7 +14123,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -14148,7 +14166,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -14300,7 +14318,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -14343,7 +14361,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -14495,7 +14513,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -14538,7 +14556,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -14690,7 +14708,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -14733,7 +14751,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -14885,7 +14903,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -14928,7 +14946,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -15080,7 +15098,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -15123,7 +15141,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -15275,7 +15293,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -15318,7 +15336,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -15470,7 +15488,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -15513,7 +15531,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -15665,7 +15683,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -15708,7 +15726,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -15860,7 +15878,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -15903,7 +15921,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -16069,7 +16087,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -16112,7 +16130,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -16264,14 +16282,19 @@
 	enable_unique=no
 fi
 
-# Check whether --enable-gen-doc was given.
-if test "${enable_gen_doc+set}" = set; then :
-  enableval=$enable_gen_doc;
+
+
+
+  # Check whether --enable-libqrencode was given.
+if test "${enable_libqrencode+set}" = set; then :
+  enableval=$enable_libqrencode; xdt_cv_QRENCODE_check=$enableval
 else
-  enable_gen_doc=no
+  xdt_cv_QRENCODE_check=yes
 fi
 
-if test x"$enable_gen_doc" = x"yes"; then
+
+  if test x"$xdt_cv_QRENCODE_check" = x"yes"; then
+    if $PKG_CONFIG --exists "libqrencode >= 3.3.0" >/dev/null 2>&1; then
 
 
   # minimum supported version of pkg-config
@@ -16305,7 +16328,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -16348,7 +16371,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -16412,153 +16435,93 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnome-doc-utils >= 0.19.2" >&5
-$as_echo_n "checking for gnome-doc-utils >= 0.19.2... " >&6; }
-  if $PKG_CONFIG "--atleast-version=0.19.2" "gnome-doc-utils" >/dev/null 2>&1; then
-    GNOME_DOC_UTILS_VERSION=`$PKG_CONFIG --modversion "gnome-doc-utils"`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNOME_DOC_UTILS_VERSION" >&5
-$as_echo "$GNOME_DOC_UTILS_VERSION" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNOME_DOC_UTILS_CFLAGS" >&5
-$as_echo_n "checking GNOME_DOC_UTILS_CFLAGS... " >&6; }
-    GNOME_DOC_UTILS_CFLAGS=`$PKG_CONFIG --cflags "gnome-doc-utils"`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNOME_DOC_UTILS_CFLAGS" >&5
-$as_echo "$GNOME_DOC_UTILS_CFLAGS" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNOME_DOC_UTILS_LIBS" >&5
-$as_echo_n "checking GNOME_DOC_UTILS_LIBS... " >&6; }
-    GNOME_DOC_UTILS_LIBS=`$PKG_CONFIG --libs "gnome-doc-utils"`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNOME_DOC_UTILS_LIBS" >&5
-$as_echo "$GNOME_DOC_UTILS_LIBS" >&6; }
-
-    GNOME_DOC_UTILS_REQUIRED_VERSION=0.19.2
-
-
-
-
-
-
-
-    # Extract the first word of "itstool", so it can be a program name with args.
-set dummy itstool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ITSTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ITSTOOL in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ITSTOOL="$ITSTOOL" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_ITSTOOL="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_ITSTOOL" && ac_cv_path_ITSTOOL="no"
-  ;;
-esac
-fi
-ITSTOOL=$ac_cv_path_ITSTOOL
-if test -n "$ITSTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ITSTOOL" >&5
-$as_echo "$ITSTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    if test x"$ITSTOOL" = x"no"; then
-        enable_gen_doc=no
-    fi
-
-    # Extract the first word of "gnome-doc-tool", so it can be a program name with args.
-set dummy gnome-doc-tool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GNOME_DOC_TOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $GNOME_DOC_TOOL in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GNOME_DOC_TOOL="$GNOME_DOC_TOOL" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_GNOME_DOC_TOOL="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_GNOME_DOC_TOOL" && ac_cv_path_GNOME_DOC_TOOL="no"
-  ;;
-esac
-fi
-GNOME_DOC_TOOL=$ac_cv_path_GNOME_DOC_TOOL
-if test -n "$GNOME_DOC_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNOME_DOC_TOOL" >&5
-$as_echo "$GNOME_DOC_TOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    if test x"$GNOME_DOC_TOOL" = x"no"; then
-        enable_gen_doc=no
-    fi
-
-  elif $PKG_CONFIG --exists "gnome-doc-utils" >/dev/null 2>&1; then
-    xdt_cv_version=`$PKG_CONFIG --modversion "gnome-doc-utils"`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libqrencode >= 3.3.0" >&5
+$as_echo_n "checking for libqrencode >= 3.3.0... " >&6; }
+  if $PKG_CONFIG "--atleast-version=3.3.0" "libqrencode" >/dev/null 2>&1; then
+    QRENCODE_VERSION=`$PKG_CONFIG --modversion "libqrencode"`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QRENCODE_VERSION" >&5
+$as_echo "$QRENCODE_VERSION" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking QRENCODE_CFLAGS" >&5
+$as_echo_n "checking QRENCODE_CFLAGS... " >&6; }
+    QRENCODE_CFLAGS=`$PKG_CONFIG --cflags "libqrencode"`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QRENCODE_CFLAGS" >&5
+$as_echo "$QRENCODE_CFLAGS" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking QRENCODE_LIBS" >&5
+$as_echo_n "checking QRENCODE_LIBS... " >&6; }
+    QRENCODE_LIBS=`$PKG_CONFIG --libs "libqrencode"`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QRENCODE_LIBS" >&5
+$as_echo "$QRENCODE_LIBS" >&6; }
+
+    QRENCODE_REQUIRED_VERSION=3.3.0
+
+
+
+
+
+
+
+
+$as_echo "#define HAVE_QRENCODE 1" >>confdefs.h
+
+        QRENCODE_FOUND="yes"
+
+  elif $PKG_CONFIG --exists "libqrencode" >/dev/null 2>&1; then
+    xdt_cv_version=`$PKG_CONFIG --modversion "libqrencode"`
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5
 $as_echo "found, but $xdt_cv_version" >&6; }
 
 
-    enable_gen_doc=no
+      echo "*** The required package libqrencode was found on your system,"
+      echo "*** but the installed version ($xdt_cv_version) is too old."
+      echo "*** Please upgrade libqrencode to atleast version 3.3.0, or adjust"
+      echo "*** the PKG_CONFIG_PATH environment variable if you installed"
+      echo "*** the new version of the package in a nonstandard prefix so"
+      echo "*** pkg-config is able to find it."
+      exit 1
 
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 $as_echo "not found" >&6; }
 
 
-    enable_gen_doc=no
-
-  fi
-
-
-  if test x"$enable_gen_doc" = x"no"; then
-    as_fn_error $? "Compiling with --enable-gen-doc but no suitable gnome-doc-utils and/or itstool found." "$LINENO" 5
-  fi
-fi
- if test x"$enable_gen_doc" = x"yes"; then
-  GENERATE_DOCUMENTATION_TRUE=
-  GENERATE_DOCUMENTATION_FALSE='#'
-else
-  GENERATE_DOCUMENTATION_TRUE='#'
-  GENERATE_DOCUMENTATION_FALSE=
-fi
-
+      echo "*** The required package libqrencode was not found on your system."
+      echo "*** Please install libqrencode (atleast version 3.3.0) or adjust"
+      echo "*** the PKG_CONFIG_PATH environment variable if you"
+      echo "*** installed the package in a nonstandard prefix so that"
+      echo "*** pkg-config is able to find it."
+      exit 1
+
+  fi
+
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package libqrencode >= 3.3.0" >&5
+$as_echo_n "checking for optional package libqrencode >= 3.3.0... " >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+    fi
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package libqrencode" >&5
+$as_echo_n "checking for optional package libqrencode... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
+  fi
+
+   if test x"$QRENCODE_FOUND" = x"yes"; then
+  HAVE_QRENCODE_TRUE=
+  HAVE_QRENCODE_FALSE='#'
+else
+  HAVE_QRENCODE_TRUE='#'
+  HAVE_QRENCODE_FALSE=
+fi
+
+
+if test x"$QRENCODE_FOUND" = x"yes"; then
+	enable_qrencode=yes
+else
+	enable_qrencode=no
+fi
 
 
     GETTEXT_PACKAGE=xfce4-clipman-plugin
@@ -16569,7 +16532,7 @@
 
 
 
-    ALL_LINGUAS="ar ast be ca cs da de el en_GB es eu fi fr gl he hr hu id is it ja kk ko lt lv nb nl pl pt pt_BR ru sk sq sv tr ug uk ur ur_PK vi zh_CN zh_TW "
+    ALL_LINGUAS="ar ast be bg ca cs da de el en_AU en_GB es eu fi fr gl he hr hu id is it ja kk ko lt lv nb nl oc pl pt_BR pt ru sk sl sq sr sv tr ug uk ur_PK ur vi zh_CN zh_TW "
 
    for ac_header in locale.h
 do :
@@ -17068,7 +17031,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -17343,7 +17306,7 @@
                               -Wcast-align -Wformat-security \
                               -Winit-self -Wmissing-include-dirs -Wundef \
                               -Wmissing-format-attribute -Wnested-externs"
-    CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
+    CPPFLAGS="$CPPFLAGS"
 
     if test x`uname` = x"Linux"; then
       xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector"
@@ -17403,7 +17366,7 @@
     CPPFLAGS="$CPPFLAGS -DNDEBUG"
 
     if test x"$enable_debug" = x"no"; then
-      CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
+      CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT"
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
     else
@@ -17413,7 +17376,7 @@
   fi
 
 
-ac_config_files="$ac_config_files Makefile icons/Makefile icons/16x16/Makefile icons/22x22/Makefile icons/24x24/Makefile icons/32x32/Makefile icons/scalable/Makefile x11-clipboard-manager/Makefile panel-plugin/Makefile tests/Makefile po/Makefile.in doc/Makefile doc/media/Makefile doc/po/Makefile"
+ac_config_files="$ac_config_files Makefile icons/Makefile icons/16x16/Makefile icons/22x22/Makefile icons/24x24/Makefile icons/32x32/Makefile icons/scalable/Makefile x11-clipboard-manager/Makefile panel-plugin/Makefile tests/Makefile po/Makefile.in"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -17556,8 +17519,8 @@
   as_fn_error $? "conditional \"HAVE_UNIQUE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${GENERATE_DOCUMENTATION_TRUE}" && test -z "${GENERATE_DOCUMENTATION_FALSE}"; then
-  as_fn_error $? "conditional \"GENERATE_DOCUMENTATION\" was never defined.
+if test -z "${HAVE_QRENCODE_TRUE}" && test -z "${HAVE_QRENCODE_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_QRENCODE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
@@ -17858,16 +17821,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -17927,28 +17890,16 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -17969,8 +17920,8 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Clipman $as_me 1.2.3, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+This file was extended by Clipman $as_me 1.2.4, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -18036,11 +17987,11 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Clipman config.status 1.2.3
-configured by $0, generated by GNU Autoconf 2.68,
+Clipman config.status 1.2.4
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -18131,7 +18082,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -18458,9 +18409,6 @@
     "panel-plugin/Makefile") CONFIG_FILES="$CONFIG_FILES panel-plugin/Makefile" ;;
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-    "doc/media/Makefile") CONFIG_FILES="$CONFIG_FILES doc/media/Makefile" ;;
-    "doc/po/Makefile") CONFIG_FILES="$CONFIG_FILES doc/po/Makefile" ;;
     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
@@ -19849,8 +19797,5 @@
 echo
 echo "    * Debug Support:    $enable_debug"
 echo "    * Unique:           $enable_unique"
-echo
-if test "x$USE_MAINTAINER_MODE" = "xyes" ; then
-echo "Enable Documentation: $enable_gen_doc"
-echo
-fi
+echo "    * QR Code:          $enable_qrencode"
+echo

=== modified file 'configure.ac'
--- configure.ac	2012-04-09 21:26:50 +0000
+++ configure.ac	2014-02-06 05:26:15 +0000
@@ -16,8 +16,8 @@
 dnl ***************************
 m4_define([project_version_major], [1])
 m4_define([project_version_minor], [2])
-m4_define([project_version_micro], [3])
-m4_define([project_version_build], [b04de51])
+m4_define([project_version_micro], [4])
+m4_define([project_version_build], [130aa64])
 m4_define([project_version_tag], []) # leave empty for release
 m4_define([project_version], [project_version_major().project_version_minor().project_version_micro()ifelse(project_version_tag(), [git], [project_version_tag()-project_version_build()], [project_version_tag()])])
 
@@ -28,6 +28,7 @@
         The Xfce development team. All rights reserved.])
 AC_INIT([Clipman], [project_version], [http://bugzilla.xfce.org/], [xfce4-clipman-plugin],
        	[http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin])
+AC_CONFIG_HEADERS([config.h])
 AC_PREREQ([2.50])
 AC_CANONICAL_TARGET()
 AC_REVISION([project_version_build])
@@ -36,7 +37,6 @@
 dnl *** Initialize automake ***
 dnl ***************************
 AM_INIT_AUTOMAKE([1.8 no-dist-gzip dist-bzip2])
-AM_CONFIG_HEADER([config.h])
 AM_MAINTAINER_MODE()
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
@@ -86,39 +86,20 @@
 	enable_unique=no
 fi
 
-dnl *******************************
-dnl *** Check for documentation ***
-dnl *******************************
-AC_ARG_ENABLE([gen-doc], [AC_HELP_STRING([--enable-gen-doc],
-              [Generate HTML documentation (requires gnome-doc-utils) [default=no]])],,
-              [enable_gen_doc=no])
-if test x"$enable_gen_doc" = x"yes"; then
-  XDT_CHECK_PACKAGE([GNOME_DOC_UTILS], [gnome-doc-utils], [0.19.2],
-  [
-    AC_PATH_PROG([ITSTOOL], [itstool], [no])
-    if test x"$ITSTOOL" = x"no"; then
-        enable_gen_doc=no
-    fi
-
-    AC_PATH_PROG([GNOME_DOC_TOOL], [gnome-doc-tool], [no])
-    if test x"$GNOME_DOC_TOOL" = x"no"; then
-        enable_gen_doc=no
-    fi
-  ],
-  [
-    enable_gen_doc=no
-  ])
-
-  if test x"$enable_gen_doc" = x"no"; then
-    AC_MSG_ERROR([Compiling with --enable-gen-doc but no suitable gnome-doc-utils and/or itstool found.])
-  fi
+dnl *****************************
+dnl *** Check for libqrencode ***
+dnl *****************************
+XDT_CHECK_OPTIONAL_PACKAGE([QRENCODE], [libqrencode], [3.3.0], libqrencode, [QR Code support])
+if test x"$QRENCODE_FOUND" = x"yes"; then
+	enable_qrencode=yes
+else
+	enable_qrencode=no
 fi
-AM_CONDITIONAL([GENERATE_DOCUMENTATION], [test x"$enable_gen_doc" = x"yes"])
 
 dnl ******************************
 dnl *** Check for i18n support ***
 dnl ******************************
-XDT_I18N([ar ast be ca cs da de el en_GB es eu fi fr gl he hr hu id is it ja kk ko lt lv nb nl pl pt pt_BR ru sk sq sv tr ug uk ur ur_PK vi zh_CN zh_TW ])
+XDT_I18N([ar ast be bg ca cs da de el en_AU en_GB es eu fi fr gl he hr hu id is it ja kk ko lt lv nb nl oc pl pt_BR pt ru sk sl sq sr sv tr ug uk ur_PK ur vi zh_CN zh_TW ])
 
 dnl ***********************************
 dnl *** Check for debugging support ***
@@ -140,9 +121,6 @@
 panel-plugin/Makefile
 tests/Makefile
 po/Makefile.in
-doc/Makefile
-doc/media/Makefile
-doc/po/Makefile
 ])
 
 dnl ***************************
@@ -153,8 +131,5 @@
 echo
 echo "    * Debug Support:    $enable_debug"
 echo "    * Unique:           $enable_unique"
-echo
-if test "x$USE_MAINTAINER_MODE" = "xyes" ; then
-echo "Enable Documentation: $enable_gen_doc"
-echo
-fi
+echo "    * QR Code:          $enable_qrencode"
+echo

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-15 22:23:37 +0000
+++ debian/changelog	2014-02-06 05:26:15 +0000
@@ -1,3 +1,27 @@
+xfce4-clipman-plugin (2:1.2.4-1ubuntu1) trusty; urgency=medium
+
+  * Merge from debian. Remaining changes:
+    - Use dh_autotools-dev to update config.{sub,guess} for AArch64.
+
+ -- Jackson Doak <[e-mail]>  Thu, 06 Feb 2014 16:16:37 +1100
+
+xfce4-clipman-plugin (2:1.2.4-1) unstable; urgency=low
+
+  [ Evgeni Golov ]
+  * Correct Vcs-* URLs to point to anonscm.debian.org
+
+  [ Yves-Alexis Perez ]
+  * New upstream release.
+  * debian/xfce4-clipman.install:
+    - drop /usr/share/doc, documentation has been removed from upstream
+      package.
+  * debian/control:
+    - update standards version to 3.9.5.
+  * debian/rules:
+    - disable silent rules.
+
+ -- Yves-Alexis Perez <[e-mail]>  Mon, 03 Feb 2014 08:07:45 +0100
+
 xfce4-clipman-plugin (2:1.2.3-2ubuntu1) saucy; urgency=low
 
   * Use dh_autotools-dev to update config.{sub,guess} for AArch64.

=== modified file 'debian/control'
--- debian/control	2013-05-23 08:10:17 +0000
+++ debian/control	2014-02-06 05:26:15 +0000
@@ -1,7 +1,8 @@
 Source: xfce4-clipman-plugin
 Section: xfce
 Priority: optional
-Maintainer: Debian Xfce Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Xfce Maintainers <[e-mail]>
 Uploaders: Yves-Alexis Perez <[e-mail]>,
  Lionel Le Folgoc <[e-mail]>,
  Mike Massonnet <[e-mail]>
@@ -10,10 +11,10 @@
  libx11-dev, pkg-config, libgtk2.0-dev, libexo-1-dev, 
  libxfconf-0-dev, libglade2-dev, libunique-dev, libxfce4ui-1-dev,
  libxtst-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
 Homepage: http://goodies.xfce.org/
-Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-clipman-plugin/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-clipman-plugin/
+Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/xfce4-clipman-plugin/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-xfce/goodies/trunk/xfce4-clipman-plugin/
 
 Package: xfce4-clipman
 Section: xfce

=== modified file 'debian/rules'
--- debian/rules	2013-10-15 22:23:37 +0000
+++ debian/rules	2014-02-06 05:26:15 +0000
@@ -7,7 +7,7 @@
 	dh $@ --parallel --with autotools_dev
 
 override_dh_auto_configure:
-	dh_auto_configure -- --disable-static
+	dh_auto_configure -- --disable-static --disable-silent-rules
 
 override_dh_auto_install:
 	dh_auto_install

=== modified file 'debian/xfce4-clipman.install'
--- debian/xfce4-clipman.install	2011-10-24 17:48:46 +0000
+++ debian/xfce4-clipman.install	2014-02-06 05:26:15 +0000
@@ -3,4 +3,3 @@
 usr/share/applications
 usr/share/icons
 usr/share/locale
-usr/share/doc

=== modified file 'depcomp'
--- depcomp	2012-04-09 21:26:50 +0000
+++ depcomp	2014-02-06 05:26:15 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2011-12-04.11; # UTC
+scriptversion=2012-03-27.16; # UTC
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
-# 2011 Free Software Foundation, Inc.
+# 2011, 2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 
 case $1 in
   '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
@@ -40,8 +40,8 @@
 
 Environment variables:
   depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
   tmpdepfile  Temporary file to use when outputting dependencies.
@@ -57,6 +57,12 @@
     ;;
 esac
 
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
@@ -102,6 +108,12 @@
    depmode=msvc7
 fi
 
+if test "$depmode" = xlc; then
+   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
+   gccflag=-qmakedep=gcc,-MF
+   depmode=gcc
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
@@ -156,15 +168,14 @@
 ## The second -e expression handles DOS-style file names with drive letters.
   sed -e 's/^[^:]*: / /' \
       -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
+## This next piece of magic avoids the "deleted header file" problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
+  tr ' ' "$nl" < "$tmpdepfile" |
+## Some versions of gcc put a space before the ':'.  On the theory
 ## that the space means something, we add a space to the output as
 ## well.  hp depmode also adds that space, but also prefixes the VPATH
 ## to the object.  Take care to not repeat it in the output.
@@ -203,18 +214,15 @@
     # clever and replace this with sed code, as IRIX sed won't handle
     # lines with more than a fixed number of characters (4096 in
     # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
+    # the IRIX cc adds comments like '#:fec' to the end of the
     # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
+    tr ' ' "$nl" < "$tmpdepfile" \
     | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> "$depfile"
+    tr "$nl" ' ' >> "$depfile"
     echo >> "$depfile"
 
     # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
+    tr ' ' "$nl" < "$tmpdepfile" \
    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
    >> "$depfile"
   else
@@ -226,10 +234,17 @@
   rm -f "$tmpdepfile"
   ;;
 
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 aix)
   # The C for AIX Compiler uses -M and outputs the dependencies
   # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
@@ -259,12 +274,11 @@
     test -f "$tmpdepfile" && break
   done
   if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
+    # Each line is of the form 'foo.o: dependent.h'.
     # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
+    # '$object: dependent.h' and one to simply 'dependent.h:'.
     sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    # That's a tab and a space in the [].
-    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+    sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
@@ -275,23 +289,26 @@
   ;;
 
 icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
+  # However on
+  #    $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
   # ICC 7.0 will fill foo.d with something like
   #    foo.o: sub/foo.c
   #    foo.o: sub/foo.h
-  # which is wrong.  We want:
+  # which is wrong.  We want
   #    sub/foo.o: sub/foo.c
   #    sub/foo.o: sub/foo.h
   #    sub/foo.c:
   #    sub/foo.h:
   # ICC 7.1 will output
   #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
+  # and will wrap long lines using '\':
   #    foo.o: sub/foo.c ... \
   #     sub/foo.h ... \
   #     ...
-
+  # tcc 0.9.26 (FIXME still under development at the moment of writing)
+  # will emit a similar output, but also prepend the continuation lines
+  # with horizontal tabulation characters.
   "$@" -MD -MF "$tmpdepfile"
   stat=$?
   if test $stat -eq 0; then :
@@ -300,15 +317,21 @@
     exit $stat
   fi
   rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Each line is of the form 'foo.o: dependent.h',
+  # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
   # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
+  # '$object: dependent.h' and one to simply 'dependent.h:'.
+  sed -e "s/^[ $tab][ $tab]*/  /" -e "s,^[^:]*:,$object :," \
+    < "$tmpdepfile" > "$depfile"
+  sed '
+    s/[ '"$tab"'][ '"$tab"']*/ /g
+    s/^ *//
+    s/ *\\*$//
+    s/^[^:]*: *//
+    /^$/d
+    /:$/d
+    s/$/ :/
+  ' < "$tmpdepfile" >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -344,7 +367,7 @@
   done
   if test -f "$tmpdepfile"; then
     sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add `dependent.h:' lines.
+    # Add 'dependent.h:' lines.
     sed -ne '2,${
 	       s/^ *//
 	       s/ \\*$//
@@ -359,9 +382,9 @@
 
 tru64)
    # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+   # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
    # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
+   # dependencies in 'foo.d' instead, so we check for that too.
    # Subdirectories are respected.
    dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
    test "x$dir" = "x$object" && dir=
@@ -407,8 +430,7 @@
    done
    if test -f "$tmpdepfile"; then
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+      sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
    else
       echo "#dummy" > "$depfile"
    fi
@@ -443,11 +465,11 @@
   p
 }' | $cygpath_u | sort -u | sed -n '
 s/ /\\ /g
-s/\(.*\)/	\1 \\/p
+s/\(.*\)/'"$tab"'\1 \\/p
 s/.\(.*\) \\/\1:/
 H
 $ {
-  s/.*/	/
+  s/.*/'"$tab"'/
   G
   p
 }' >> "$depfile"
@@ -478,7 +500,7 @@
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -498,15 +520,14 @@
   done
 
   test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
+  # Require at least two characters before searching for ':'
   # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
   "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
+    sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
+  tr ' ' "$nl" < "$tmpdepfile" | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
     sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
@@ -562,8 +583,7 @@
   # makedepend may prepend the VPATH from the source file name to the object.
   # No need to regex-escape $object, excess matching of '.' is harmless.
   sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
+  sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
     sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
@@ -583,7 +603,7 @@
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -652,8 +672,8 @@
   sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
   sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;

=== removed directory 'doc'
=== removed file 'doc/Makefile.am'
--- doc/Makefile.am	2011-11-01 18:47:59 +0000
+++ doc/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,116 +0,0 @@
-SUBDIRS = media po
-
-MALLARD_PAGE = index.page
-MALLARD_CSS = index.css
-MALLARD_XSL = index.xsl
-
-TARGET_DIR = $(DESTDIR)$(docdir)/html
-LINGUAS = $(shell cd $(srcdir)/po && echo `/bin/ls *.po 2> /dev/null | sed 's,[.]po,,g'`)
-
-EXTRA_DIST = $(MALLARD_PAGE) $(MALLARD_CSS) $(MALLARD_XSL)
-CLEANFILES = doc-build.stamp
-
-install-data-local:
-	echo "*** Installing HTML documentation"; \
-	if test -d "$(srcdir)/html"; then \
-		echo "--- $(TARGET_DIR)/$(MALLARD_CSS)"; \
-		$(mkinstalldirs) $(TARGET_DIR); \
-		$(INSTALL_DATA) $(srcdir)/html/$(MALLARD_CSS) $(TARGET_DIR); \
-		for lang in C $(LINGUAS); do \
-			echo "--- $(TARGET_DIR)/$$lang/"; \
-			if test -d "$(srcdir)/html/$$lang"; then \
-				$(mkinstalldirs) $(TARGET_DIR)/$$lang; \
-				$(INSTALL_DATA) $(srcdir)/html/$$lang/index.html $(TARGET_DIR)/$$lang; \
-			fi; \
-			if test ! -d "$(TARGET_DIR)/$$lang/media" -o -L "$(TARGET_DIR)/$$lang/media"; then \
-				if test -L "$(TARGET_DIR)/$$lang/media"; then \
-					rm -f $(TARGET_DIR)/$$lang/media; \
-				fi; \
-				$(LN_S) ../C/media $(TARGET_DIR)/$$lang/media; \
-			fi; \
-		done; \
-	else \
-		echo "--- Nothing to install into $(TARGET_DIR)"; \
-	fi
-
-uninstall-local:
-	echo "*** Uninstalling HTML documentation"; \
-	echo "--- $(TARGET_DIR)/$(MALLARD_CSS)"; \
-	rm -f $(TARGET_DIR)/$(MALLARD_CSS); \
-	for lang in C $(LINGUAS); do \
-		echo "--- $(TARGET_DIR)/$$lang/"; \
-		rm -f $(TARGET_DIR)/$$lang/index.html; \
-		if test -L $(TARGET_DIR)/$$lang/media; then \
-			rm -f $(TARGET_DIR)/$$lang/media; \
-		fi; \
-	done
-
-clean-local:
-	rm -rf "$(srcdir)/html"
-
-if GENERATE_DOCUMENTATION
-
-update-po:
-	rm -f "$(srcdir)/po/$(GETTEXT_PACKAGE).pot"
-	$(ITSTOOL) -o "$(srcdir)/po/$(GETTEXT_PACKAGE).pot" $(MALLARD_PAGE)
-	for lang in $(LINGUAS); do \
-		echo -n "$$lang.po... "; \
-		$(MSGMERGE) --backup=none -U "$(srcdir)/po/$$lang.po" "$(srcdir)/po/$(GETTEXT_PACKAGE).pot"; \
-	done
-
-doc-build.stamp: $(MALLARD_PAGE) $(MALLARD_CSS) $(MALLARD_XSL)
-	@-chmod -R u+w "$(srcdir)"
-	rm -rf "$(srcdir)/html"
-	@echo "*** Building HTML documentation"
-	@echo "--- Generating C documentation"
-	$(GNOME_DOC_TOOL) html -o "$(srcdir)/html/C/" -x "$(srcdir)/$(MALLARD_XSL)" -c "../$(MALLARD_CSS)" "$(srcdir)/$(MALLARD_PAGE)"
-	cp "$(srcdir)/$(MALLARD_CSS)" "$(srcdir)/html"
-	@rm "$(srcdir)/html/C/index.cache"
-	for lang in $(LINGUAS); do \
-		echo "--- Generating $$lang documentation"; \
-		mkdir -p "$(srcdir)/tmp"; \
-		$(MSGFMT) -o "$(srcdir)/tmp/$$lang.mo" "$(srcdir)/po/$$lang.po"; \
-		$(ITSTOOL) -l "$$lang" -m "$(srcdir)/tmp/$$lang.mo" -o "$(srcdir)/tmp/index.page" "$(srcdir)/$(MALLARD_PAGE)"; \
-		$(GNOME_DOC_TOOL) html -n -o "$(srcdir)/html/$$lang/" -x "$(srcdir)/$(MALLARD_XSL)" -c "../$(MALLARD_CSS)" "$(srcdir)/tmp/index.page"; \
-		chmod -R u+w "$(srcdir)/html/$$lang"; \
-		rm -rf "$(srcdir)/tmp" "$(srcdir)/html/$$lang/index.cache"; \
-	done
-	touch doc-build.stamp
-
-dist-check-doc: all
-
-else
-
-update-po:
-	@echo "*** You need to compile with --enable-gen-doc in order to run make update-po"
-	@false
-
-doc-build.stamp:
-	@if test ! -d "$(srcdir)/html"; then \
-		echo; \
-		echo "*** No generated documenation found. If you want to "; \
-		echo "*** generate the (translated) documentation, run configure"; \
-		echo "*** with --enable-gen-doc."; \
-		echo; \
-	fi
-
-dist-check-doc:
-	@echo "*** You need to compile with --enable-gen-doc in order to run make dist"
-	@false
-
-endif
-
-all: doc-build.stamp
-
-dist-hook: dist-check-doc doc-build.stamp
-	mkdir -p "$(distdir)/html"; \
-	if test -f "$(srcdir)/html/$(MALLARD_CSS)"; then \
-		cp "$(srcdir)/html/$(MALLARD_CSS)" "$(distdir)/html"; \
-	fi; \
-	for lang in C $(LINGUAS); do \
-		if test -f "$(srcdir)/html/$$lang/index.html"; then \
-			mkdir -p "$(distdir)/html/$$lang"; \
-			cp -t "$(distdir)/html/$$lang/" $(srcdir)/html/$$lang/*; \
-		fi; \
-	done
-

=== removed file 'doc/Makefile.in'
--- doc/Makefile.in	2012-04-09 21:26:50 +0000
+++ doc/Makefile.in	1970-01-01 00:00:00 +0000
@@ -1,775 +0,0 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@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
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-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@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXO_CFLAGS = @EXO_CFLAGS@
-EXO_LIBS = @EXO_LIBS@
-EXO_REQUIRED_VERSION = @EXO_REQUIRED_VERSION@
-EXO_VERSION = @EXO_VERSION@
-FGREP = @FGREP@
-GDKX_CFLAGS = @GDKX_CFLAGS@
-GDKX_LIBS = @GDKX_LIBS@
-GDKX_REQUIRED_VERSION = @GDKX_REQUIRED_VERSION@
-GDKX_VERSION = @GDKX_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GIO_REQUIRED_VERSION = @GIO_REQUIRED_VERSION@
-GIO_VERSION = @GIO_VERSION@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
-GLIB_VERSION = @GLIB_VERSION@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GNOME_DOC_TOOL = @GNOME_DOC_TOOL@
-GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
-GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
-GNOME_DOC_UTILS_REQUIRED_VERSION = @GNOME_DOC_UTILS_REQUIRED_VERSION@
-GNOME_DOC_UTILS_VERSION = @GNOME_DOC_UTILS_VERSION@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
-GTK_VERSION = @GTK_VERSION@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-ITSTOOL = @ITSTOOL@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBX11_CFLAGS = @LIBX11_CFLAGS@
-LIBX11_LDFLAGS = @LIBX11_LDFLAGS@
-LIBX11_LIBS = @LIBX11_LIBS@
-LIBXFCE4PANEL_CFLAGS = @LIBXFCE4PANEL_CFLAGS@
-LIBXFCE4PANEL_LIBS = @LIBXFCE4PANEL_LIBS@
-LIBXFCE4PANEL_REQUIRED_VERSION = @LIBXFCE4PANEL_REQUIRED_VERSION@
-LIBXFCE4PANEL_VERSION = @LIBXFCE4PANEL_VERSION@
-LIBXFCE4UI_CFLAGS = @LIBXFCE4UI_CFLAGS@
-LIBXFCE4UI_LIBS = @LIBXFCE4UI_LIBS@
-LIBXFCE4UI_REQUIRED_VERSION = @LIBXFCE4UI_REQUIRED_VERSION@
-LIBXFCE4UI_VERSION = @LIBXFCE4UI_VERSION@
-LIBXFCE4UTIL_CFLAGS = @LIBXFCE4UTIL_CFLAGS@
-LIBXFCE4UTIL_LIBS = @LIBXFCE4UTIL_LIBS@
-LIBXFCE4UTIL_REQUIRED_VERSION = @LIBXFCE4UTIL_REQUIRED_VERSION@
-LIBXFCE4UTIL_VERSION = @LIBXFCE4UTIL_VERSION@
-LIBXPROTO_CFLAGS = @LIBXPROTO_CFLAGS@
-LIBXPROTO_LIBS = @LIBXPROTO_LIBS@
-LIBXPROTO_REQUIRED_VERSION = @LIBXPROTO_REQUIRED_VERSION@
-LIBXPROTO_VERSION = @LIBXPROTO_VERSION@
-LIBXTST_CFLAGS = @LIBXTST_CFLAGS@
-LIBXTST_LIBS = @LIBXTST_LIBS@
-LIBXTST_REQUIRED_VERSION = @LIBXTST_REQUIRED_VERSION@
-LIBXTST_VERSION = @LIBXTST_VERSION@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-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@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
-UNIQUE_LIBS = @UNIQUE_LIBS@
-UNIQUE_REQUIRED_VERSION = @UNIQUE_REQUIRED_VERSION@
-UNIQUE_VERSION = @UNIQUE_VERSION@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XFCONF_CFLAGS = @XFCONF_CFLAGS@
-XFCONF_LIBS = @XFCONF_LIBS@
-XFCONF_REQUIRED_VERSION = @XFCONF_REQUIRED_VERSION@
-XFCONF_VERSION = @XFCONF_VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_ARGS = @XGETTEXT_ARGS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = media po
-MALLARD_PAGE = index.page
-MALLARD_CSS = index.css
-MALLARD_XSL = index.xsl
-TARGET_DIR = $(DESTDIR)$(docdir)/html
-LINGUAS = $(shell cd $(srcdir)/po && echo `/bin/ls *.po 2> /dev/null | sed 's,[.]po,,g'`)
-EXTRA_DIST = $(MALLARD_PAGE) $(MALLARD_CSS) $(MALLARD_XSL)
-CLEANFILES = doc-build.stamp
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(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; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu doc/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (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'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(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" = . || ($(am__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); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	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; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	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; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$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; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	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" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  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 {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@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 && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-hook
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-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"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-data-local
-
-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
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-local
-
-.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 \
-	clean-local ctags ctags-recursive dist-hook distclean \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-data-local install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-local
-
-
-install-data-local:
-	echo "*** Installing HTML documentation"; \
-	if test -d "$(srcdir)/html"; then \
-		echo "--- $(TARGET_DIR)/$(MALLARD_CSS)"; \
-		$(mkinstalldirs) $(TARGET_DIR); \
-		$(INSTALL_DATA) $(srcdir)/html/$(MALLARD_CSS) $(TARGET_DIR); \
-		for lang in C $(LINGUAS); do \
-			echo "--- $(TARGET_DIR)/$$lang/"; \
-			if test -d "$(srcdir)/html/$$lang"; then \
-				$(mkinstalldirs) $(TARGET_DIR)/$$lang; \
-				$(INSTALL_DATA) $(srcdir)/html/$$lang/index.html $(TARGET_DIR)/$$lang; \
-			fi; \
-			if test ! -d "$(TARGET_DIR)/$$lang/media" -o -L "$(TARGET_DIR)/$$lang/media"; then \
-				if test -L "$(TARGET_DIR)/$$lang/media"; then \
-					rm -f $(TARGET_DIR)/$$lang/media; \
-				fi; \
-				$(LN_S) ../C/media $(TARGET_DIR)/$$lang/media; \
-			fi; \
-		done; \
-	else \
-		echo "--- Nothing to install into $(TARGET_DIR)"; \
-	fi
-
-uninstall-local:
-	echo "*** Uninstalling HTML documentation"; \
-	echo "--- $(TARGET_DIR)/$(MALLARD_CSS)"; \
-	rm -f $(TARGET_DIR)/$(MALLARD_CSS); \
-	for lang in C $(LINGUAS); do \
-		echo "--- $(TARGET_DIR)/$$lang/"; \
-		rm -f $(TARGET_DIR)/$$lang/index.html; \
-		if test -L $(TARGET_DIR)/$$lang/media; then \
-			rm -f $(TARGET_DIR)/$$lang/media; \
-		fi; \
-	done
-
-clean-local:
-	rm -rf "$(srcdir)/html"
-
-@GENERATE_DOCUMENTATION_TRUE@update-po:
-@GENERATE_DOCUMENTATION_TRUE@	rm -f "$(srcdir)/po/$(GETTEXT_PACKAGE).pot"
-@GENERATE_DOCUMENTATION_TRUE@	$(ITSTOOL) -o "$(srcdir)/po/$(GETTEXT_PACKAGE).pot" $(MALLARD_PAGE)
-@GENERATE_DOCUMENTATION_TRUE@	for lang in $(LINGUAS); do \
-@GENERATE_DOCUMENTATION_TRUE@		echo -n "$$lang.po... "; \
-@GENERATE_DOCUMENTATION_TRUE@		$(MSGMERGE) --backup=none -U "$(srcdir)/po/$$lang.po" "$(srcdir)/po/$(GETTEXT_PACKAGE).pot"; \
-@GENERATE_DOCUMENTATION_TRUE@	done
-
-@[e-mail]: $(MALLARD_PAGE) $(MALLARD_CSS) $(MALLARD_XSL)
-@GENERATE_DOCUMENTATION_TRUE@	@-chmod -R u+w "$(srcdir)"
-@GENERATE_DOCUMENTATION_TRUE@	rm -rf "$(srcdir)/html"
-@GENERATE_DOCUMENTATION_TRUE@	@echo "*** Building HTML documentation"
-@GENERATE_DOCUMENTATION_TRUE@	@echo "--- Generating C documentation"
-@GENERATE_DOCUMENTATION_TRUE@	$(GNOME_DOC_TOOL) html -o "$(srcdir)/html/C/" -x "$(srcdir)/$(MALLARD_XSL)" -c "../$(MALLARD_CSS)" "$(srcdir)/$(MALLARD_PAGE)"
-@GENERATE_DOCUMENTATION_TRUE@	cp "$(srcdir)/$(MALLARD_CSS)" "$(srcdir)/html"
-@GENERATE_DOCUMENTATION_TRUE@	@rm "$(srcdir)/html/C/index.cache"
-@GENERATE_DOCUMENTATION_TRUE@	for lang in $(LINGUAS); do \
-@GENERATE_DOCUMENTATION_TRUE@		echo "--- Generating $$lang documentation"; \
-@GENERATE_DOCUMENTATION_TRUE@		mkdir -p "$(srcdir)/tmp"; \
-@GENERATE_DOCUMENTATION_TRUE@		$(MSGFMT) -o "$(srcdir)/tmp/$$lang.mo" "$(srcdir)/po/$$lang.po"; \
-@GENERATE_DOCUMENTATION_TRUE@		$(ITSTOOL) -l "$$lang" -m "$(srcdir)/tmp/$$lang.mo" -o "$(srcdir)/tmp/index.page" "$(srcdir)/$(MALLARD_PAGE)"; \
-@GENERATE_DOCUMENTATION_TRUE@		$(GNOME_DOC_TOOL) html -n -o "$(srcdir)/html/$$lang/" -x "$(srcdir)/$(MALLARD_XSL)" -c "../$(MALLARD_CSS)" "$(srcdir)/tmp/index.page"; \
-@GENERATE_DOCUMENTATION_TRUE@		chmod -R u+w "$(srcdir)/html/$$lang"; \
-@GENERATE_DOCUMENTATION_TRUE@		rm -rf "$(srcdir)/tmp" "$(srcdir)/html/$$lang/index.cache"; \
-@GENERATE_DOCUMENTATION_TRUE@	done
-@GENERATE_DOCUMENTATION_TRUE@	touch doc-build.stamp
-
-@GENERATE_DOCUMENTATION_TRUE@dist-check-doc: all
-
-@GENERATE_DOCUMENTATION_FALSE@update-po:
-@GENERATE_DOCUMENTATION_FALSE@	@echo "*** You need to compile with --enable-gen-doc in order to run make update-po"
-@GENERATE_DOCUMENTATION_FALSE@	@false
-
-@[e-mail]:
-@GENERATE_DOCUMENTATION_FALSE@	@if test ! -d "$(srcdir)/html"; then \
-@GENERATE_DOCUMENTATION_FALSE@		echo; \
-@GENERATE_DOCUMENTATION_FALSE@		echo "*** No generated documenation found. If you want to "; \
-@GENERATE_DOCUMENTATION_FALSE@		echo "*** generate the (translated) documentation, run configure"; \
-@GENERATE_DOCUMENTATION_FALSE@		echo "*** with --enable-gen-doc."; \
-@GENERATE_DOCUMENTATION_FALSE@		echo; \
-@GENERATE_DOCUMENTATION_FALSE@	fi
-
-@GENERATE_DOCUMENTATION_FALSE@dist-check-doc:
-@GENERATE_DOCUMENTATION_FALSE@	@echo "*** You need to compile with --enable-gen-doc in order to run make dist"
-@GENERATE_DOCUMENTATION_FALSE@	@false
-
-all: doc-build.stamp
-
-dist-hook: dist-check-doc doc-build.stamp
-	mkdir -p "$(distdir)/html"; \
-	if test -f "$(srcdir)/html/$(MALLARD_CSS)"; then \
-		cp "$(srcdir)/html/$(MALLARD_CSS)" "$(distdir)/html"; \
-	fi; \
-	for lang in C $(LINGUAS); do \
-		if test -f "$(srcdir)/html/$$lang/index.html"; then \
-			mkdir -p "$(distdir)/html/$$lang"; \
-			cp -t "$(distdir)/html/$$lang/" $(srcdir)/html/$$lang/*; \
-		fi; \
-	done
-
-# 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:

=== removed directory 'doc/html'
=== removed directory 'doc/html/C'
=== removed file 'doc/html/C/index.html'
--- doc/html/C/index.html	2012-04-09 21:26:50 +0000
+++ doc/html/C/index.html	1970-01-01 00:00:00 +0000
@@ -1,400 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html xmlns:str="http://exslt.org/strings">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Clipman</title>
-<link rel="stylesheet" type="text/css" href="../index.css">
-</head>
-<body class="">
-<div class="headbar"></div>
-<div class="body">
-<div xmlns:mal="http://projectmallard.org/1.0/" xmlns:exsl="http://exslt.org/common" class="header">
-<h1 class="title">Clipman</h1>
-<p class="p">This manual describes <span class="app">Clipman</span> version 1.2.2.
-    </p>
-<p>Last edited: 2011-11-01.
-    </p>
-<p class="p">
-        Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free
-        Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with
-        no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. The complete license text
-        is available from the <span xmlns:e="http://projectmallard.org/experimental/" class=" link"><a href="http://www.fsf.org/" title="http://www.fsf.org/">Free Software Foundation</a></span>.
-      </p>
-</div>
-<div xmlns:mal="http://projectmallard.org/1.0/" xmlns:exsl="http://exslt.org/common" class="section toc">
-<h2 class="title">Table of Contents</h2>
-<ol>
-<li>
-<p><a href="#introduction">Introduction</a></p>
-<ul><li><p><a href="#anatomy-of-a-clipboard">Anatomy of a Clipboard</a></p></li></ul>
-</li>
-<li>
-<p><a href="#starting-clipman">Starting Clipman</a></p>
-<ul><li><p><a href="#popup-command">Popup Command</a></p></li></ul>
-</li>
-<li>
-<p><a href="#settings-dialog">Settings Dialog</a></p>
-<ul><li><p><a href="#settings-general">General Settings</a></p></li></ul>
-<ul><li><p><a href="#settings-actions">Actions Settings</a></p></li></ul>
-<ul><li><p><a href="#tweaks">Tweaks</a></p></li></ul>
-<ul><li><p><a href="#settings-xfconf">Xfconf</a></p></li></ul>
-</li>
-<li><p><a href="#support">Support</a></p></li>
-<li><p><a href="#about">About Clipman</a></p></li>
-</ol>
-</div>
-<div class="section" id="introduction">
-<div class="header"><h2 class="title">Introduction</h2></div>
-<div class="contents"><p class="p first-child">
-      <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Clipman</span> is a clipboard manager for <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Xfce</span>. It keeps the clipboard contents 
-      around while it is usually lost when you close an application. It is able 
-      to handle text and images, and has a feature to execute actions on specific 
-      text by matching them against regular expressions.
-    </p></div>
-<div class="section" id="anatomy-of-a-clipboard">
-<div class="header"><h3 class="title">Anatomy of a Clipboard</h3></div>
-<div class="contents">
-<p class="p first-child">
-        In X11 (all Unix platforms) there are by default two clipboards to exchange 
-        any data between the windows. A default clipboard which is modified by 
-        manual copies (for instance when you select a file and press the copy 
-        button), and there is a primary clipboard which is modified by selections 
-        (for instance when you select text in a field).
-      </p>
-<p class="p">
-        <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Clipman</span> handles only the default clipboard, but optionnaly it can also notice 
-        the selections. When it is handling the selections, the default clipboard will 
-        always be synced with it and contain the same data. By this meaning you can 
-        paste with the keyboard what you select on screen.
-      </p>
-</div>
-</div>
-</div>
-<div class="section" id="starting-clipman">
-<div class="header"><h2 class="title">Starting Clipman</h2></div>
-<div class="contents">
-<p class="p first-child">
-      <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Clipman</span> is used to keep in history a list of clipboard contents and to restore 
-      them. The history is displayed in a menu by clicking on the main icon. Within 
-      the menu it is possible to restore a text and to clear the history.
-    </p>
-<div class="figure">
-<div class="title title-figure">Clipman menu with the history</div>
-<div class="figure-contents"><div class="media media-image first-child"><img src="media/clipman-menu.png" alt=""></div></div>
-<div class="desc desc-figure">Shows the menu that popups when clicking the Clipman icon in the Xfce Panel or the notification area</div>
-</div>
-<p class="p">
-      There are two ways to run <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Clipman</span>. You can select <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Clipman</span> in the applications menu under the category
-      Utility or type <span xmlns:e="http://projectmallard.org/experimental/" class=" cmd">xfce4-clipman</span> on the command-line, or you can add it into your panel.
-      To add a new item in the panel right click the panel and select <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">Add new item...</span>.
-    </p>
-</div>
-<div class="section" id="popup-command">
-<div class="header"><h3 class="title">Popup Command</h3></div>
-<div class="contents"><p class="p first-child">
-        <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Clipman</span> provides the command-line tool <span xmlns:e="http://projectmallard.org/experimental/" class=" cmd">xfce4-popup-clipman</span>. When called it
-        popups the main menu. The command is practical for the <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Application Shortcuts</span>
-        available at <span xmlns:e="http://projectmallard.org/experimental/" class=" guiseq"><span class=" gui">Xfce Menu</span> ▸ <span class=" gui">Settings</span> ▸ <span class=" gui">Keyboard</span></span>.
-      </p></div>
-</div>
-</div>
-<div class="section" id="settings-dialog">
-<div class="header"><h2 class="title">Settings Dialog</h2></div>
-<div class="contents"><p class="p first-child">
-      The settings dialog is available under the <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">Properties</span> item in the right click context menu on 
-      the main icon. It allows to tweak the history and to edit actions.
-    </p></div>
-<div class="section" id="settings-general">
-<div class="header"><h3 class="title">General Settings</h3></div>
-<div class="contents">
-<p class="p first-child">
-        The following list describes the available options in the <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">General</span> tab of the <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">Settings</span> dialog.
-      </p>
-<div class="terms">
-<div class="title title-terms">List of available General settings</div>
-<div class="terms-contents"><dl class="terms">
-<dt class="item-terms first-child">Sync selections</dt>
-<dd class="item-terms"><p class="p first-child">Sync the primary clipboard with the default clipboard in a way that it is possible to paste 
-            what gets selected.</p></dd>
-<dt class="item-terms">Save on quit</dt>
-<dd class="item-terms"><p class="p first-child">Keeps the history at every new session.</p></dd>
-<dt class="item-terms">Store last copied image</dt>
-<dd class="item-terms"><p class="p first-child">Allows to store one image in the history.</p></dd>
-<dt class="item-terms">Ignore selections</dt>
-<dd class="item-terms"><p class="p first-child">Prevents the primary clipboard from being inserted in the history.</p></dd>
-<dt class="item-terms">Size of the history</dt>
-<dd class="item-terms"><p class="p first-child">Sets the number of items to keep in history.</p></dd>
-</dl></div>
-</div>
-<div class="figure">
-<div class="title title-figure">General Settings</div>
-<div class="figure-contents"><div class="media media-image first-child"><img src="media/clipman-settings-general.png" alt=""></div></div>
-<div class="desc desc-figure">Settings dialog with the General tab</div>
-</div>
-</div>
-</div>
-<div class="section" id="settings-actions">
-<div class="header"><h3 class="title">Actions Settings</h3></div>
-<div class="contents">
-<p class="p first-child">
-        An action is a pair of a name and a regular expression. Each action can have one or more commands. The
-        support of actions is optional and can be enabled or disabled through the <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">Enable actions</span> option.
-      </p>
-<p class="p">
-        To add an action click the <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">Add</span> icon, to edit an action select the action and click the <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">Edit</span> icon or double click
-        the action, and to remove an action select an action and click the <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">Delete</span> icon. By adding or editing an action a
-        new dialog is opened.
-      </p>
-<p class="p">
-        To learn more about actions go to the <span xmlns:e="http://projectmallard.org/experimental/" class=" link"><a href="#action-dialog" title="">next section</a></span>.
-      </p>
-<div class="figure">
-<div class="title title-figure">Actions Settings</div>
-<div class="figure-contents"><div class="media media-image first-child"><img src="media/clipman-settings-actions.png" alt=""></div></div>
-<div class="desc desc-figure">Settings dialog with the Actions tab</div>
-</div>
-</div>
-<div class="section" id="actions-dialog">
-<div class="header"><h4 class="title">Action Dialog</h4></div>
-<div class="contents">
-<p class="p first-child">
-          An action has a human readable name that describes the pattern it is going to match. An action must have at
-          least one command which also has a human readable name. The matched text can be reused in the command.
-        </p>
-<p class="p">
-          The actions are always matched against text selections unless specified otherwise. When the box <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">Activate only
-          on manual copy</span> is checked, the action will be matched from the default clipboard (e.g. with <span xmlns:e="http://projectmallard.org/experimental/" class=" keyseq"><span class=" key">Ctrl</span>+<span class=" key">C</span></span>).
-        </p>
-<div class="figure">
-<div class="title title-figure">Action Dialog</div>
-<div class="figure-contents"><div class="media media-image first-child"><img src="media/clipman-action-dialog.png" alt=""></div></div>
-<div class="desc desc-figure">Settings dialog showing the Action Dialog when creating or editing an action</div>
-</div>
-</div>
-<div class="section" id="action-dialog-regex">
-<div class="header"><h5 class="title">Regular Expression</h5></div>
-<div class="contents">
-<p class="p first-child">
-            Basic special characters: "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">.?+*(|)[]\</span>".
-          </p>
-<div class="list"><div class="list-contents"><ul class="list">
-<li class="item-list first-child"><p class="p first-child">"<span xmlns:e="http://projectmallard.org/experimental/" class=" input">.</span>": represents a single character.</p></li>
-<li class="item-list"><p class="p first-child">"<span xmlns:e="http://projectmallard.org/experimental/" class=" input">?+*</span>": respectively means zero or one character, one or more
-              characters, and zero or more characters.</p></li>
-<li class="item-list"><p class="p first-child">"<span xmlns:e="http://projectmallard.org/experimental/" class=" input">(|)</span>": used for grouping and substitution, the vertical bar is
-              used as an OR operation.</p></li>
-<li class="item-list"><p class="p first-child">"<span xmlns:e="http://projectmallard.org/experimental/" class=" input">[^]</span>": used to match a character from a set of characters and
-              special characters, the circumflex is used at the start as a negation.</p></li>
-<li class="item-list"><p class="p first-child">"<span xmlns:e="http://projectmallard.org/experimental/" class=" input">\</span>": escapes a special character.</p></li>
-</ul></div></div>
-<p class="p">
-            Basic alphanumeric character class: "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">A-Za-z0-9</span>". Character classes
-            are used within square brackets to represent a set of characters.
-          </p>
-<div class="list">
-<div class="title title-list">Regular Expression Examples</div>
-<div class="list-contents"><ul class="list">
-<li class="item-list first-child"><p class="p first-child">"<span xmlns:e="http://projectmallard.org/experimental/" class=" input">bug ?#?[0-9]+</span>": text "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">bug</span>", zero or one
-              space, zero or one sharp character, and one or more numbers.</p></li>
-<li class="item-list"><p class="p first-child">"<span xmlns:e="http://projectmallard.org/experimental/" class=" input">(http|ftp).+\.(jpg|png|gif)</span>": text
-              "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">http</span>" or "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">ftp</span>", one or more character, a point, and the text
-              "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">jpg</span>", "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">png</span>" or "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">gif</span>".</p></li>
-<li class="item-list"><p class="p first-child">"<span xmlns:e="http://projectmallard.org/experimental/" class=" input">http://.{120}[^ ]+</span>": text "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">http://</span>", 120
-              characters, and one or more characters except a space.</p></li>
-</ul></div>
-</div>
-<div class="list">
-<div class="title title-list">External Resources</div>
-<div class="list-contents"><ul class="list"><li class="item-list first-child"><p class="p first-child"><span xmlns:e="http://projectmallard.org/experimental/" class=" link"><a href="http://en.wikipedia.org/wiki/Regular_expression" title="http://en.wikipedia.org/wiki/Regular_expression">Wikipedia
-              article about regular expressions</a></span></p></li></ul></div>
-</div>
-</div>
-</div>
-<div class="section" id="action-dialog-commands">
-<div class="header"><h5 class="title">Commands</h5></div>
-<div class="contents">
-<p class="p first-child">
-            A command can reuse one or more substitutions from the regular expression. The substitutions are represented by
-            "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">\&lt;number&gt;</span>" where <span xmlns:e="http://projectmallard.org/experimental/" class=" input">&lt;number&gt;</span> corresponds to the
-            sub-pattern within parentheses or 0 for the complete text.
-          </p>
-<p class="p">
-            For example, from the simple pattern "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">bug #(123)</span>" it is possible
-            to use "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">\0</span>" for the text "<span xmlns:e="http://projectmallard.org/experimental/" class=" output">bug #123</span>" and "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">\1</span>" 
-            for the text "<span xmlns:e="http://projectmallard.org/experimental/" class=" output">123</span>".  With the command "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">exo-open http://host/\1</span>", 
-            the real executed command would be "<span xmlns:e="http://projectmallard.org/experimental/" class=" output">exo-open http://host/123</span>".
-          </p>
-</div>
-</div>
-</div>
-</div>
-<div class="section" id="tweaks">
-<div class="header"><h3 class="title">Tweaks</h3></div>
-<div class="contents">
-<p class="p first-child">
-        The following list describes the available options in the <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">Tweaks</span> tab of the <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">Settings</span> dialog.
-      </p>
-<div class="terms">
-<div class="title title-terms">List of available Tweaks</div>
-<div class="terms-contents"><dl class="terms">
-<dt class="item-terms first-child">Paste instantly</dt>
-<dd class="item-terms"><p class="p first-child">Automatically paste a selected item from the history to the current focused window.</p></dd>
-<dt class="item-terms">Position menu at mouse pointer</dt>
-<dd class="item-terms"><p class="p first-child">Popup the menu at the mouse pointer position, only for the xfce4-popup-clipman command.</p></dd>
-<dt class="item-terms">Reorder history items</dt>
-<dd class="item-terms"><p class="p first-child">Push last copied text to the top of the history, useful to reorder old items.</p></dd>
-<dt class="item-terms">Reverse history order</dt>
-<dd class="item-terms"><p class="p first-child">Reverse order of the history shown in the menu.</p></dd>
-<dt class="item-terms">Skip actions by holding Control</dt>
-<dd class="item-terms"><p class="p first-child">When the selection is done (mouse or keyboard) and the Control key is still pressed down, the
-            popup menu for matched actions will be skipped.</p></dd>
-</dl></div>
-</div>
-<div class="figure">
-<div class="title title-figure">Tweaks</div>
-<div class="figure-contents"><div class="media media-image first-child"><img src="media/clipman-settings-tweaks.png" alt=""></div></div>
-<div class="desc desc-figure">Settings dialog with the Tweaks tab</div>
-</div>
-</div>
-</div>
-<div class="section" id="settings-xfconf">
-<div class="header"><h3 class="title">Xfconf</h3></div>
-<div class="contents">
-<p class="p first-child">
-        <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Clipman</span> uses <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Xfconf</span> to store its settings. That allows you to change the settings with the tool
-        <span xmlns:e="http://projectmallard.org/experimental/" class=" cmd">xfconf-query</span> or <span xmlns:e="http://projectmallard.org/experimental/" class=" cmd">xfce4-settings-editor</span>. The channel where <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Clipman</span> stores its settings is
-        <span xmlns:e="http://projectmallard.org/experimental/" class=" sys">xfce4-panel</span> and the base property is <span xmlns:e="http://projectmallard.org/experimental/" class=" sys">/plugins/clipman</span>. The following
-        table lists all the properties with their possible values.
-      </p>
-<div class="table">
-<div class="title title-table">Xfconf Properties</div>
-<div class="desc desc-table">Description of all Xfconf properties with their possible values</div>
-<table class="table" style="border-style: solid;">
-<thead><tr>
-<td><p class="p first-child">Property</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">Type</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">Default</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">Values</p></td>
-</tr></thead>
-<tbody>
-<tr>
-<td style="border-top-style: solid;background-color: #eeeeec;"><p class="p first-child">/settings/add-primary-clipboard</p></td>
-<td style="border-top-style: solid;border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">bool</p></td>
-<td style="border-top-style: solid;border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">false</p></td>
-<td style="border-top-style: solid;border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">true or false to sync the primary clipboard with the default clipboard</p></td>
-</tr>
-<tr>
-<td><p class="p first-child">/settings/enable-actions</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">bool</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">false</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">true or false to enable actions</p></td>
-</tr>
-<tr>
-<td style="background-color: #eeeeec;"><p class="p first-child">/settings/history-ignore-primary-clipboard</p></td>
-<td style="border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">bool</p></td>
-<td style="border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">false</p></td>
-<td style="border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">true or false to exclude the primary clipboard from the history</p></td>
-</tr>
-<tr>
-<td><p class="p first-child">/settings/max-images-in-history</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">uint</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">0</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">0-5 number of images in history</p></td>
-</tr>
-<tr>
-<td style="background-color: #eeeeec;"><p class="p first-child">/settings/max-texts-in-history</p></td>
-<td style="border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">uint</p></td>
-<td style="border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">10</p></td>
-<td style="border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">5-100 number of texts in history</p></td>
-</tr>
-<tr>
-<td><p class="p first-child">/settings/save-on-quit</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">bool</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">true</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">true or false to restore the history at every new session</p></td>
-</tr>
-<tr>
-<td style="background-color: #eeeeec;"><p class="p first-child">/tweaks/inhibit</p></td>
-<td style="border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">bool</p></td>
-<td style="border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">false</p></td>
-<td style="border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">true or false to disable the collector</p></td>
-</tr>
-<tr>
-<td><p class="p first-child">/tweaks/paste-on-activate</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">uint</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">0</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">0 to disable, 1 to paste with Ctrl+V, or 2 to paste with Shift+Insert as soon as an item is selected from the history</p></td>
-</tr>
-<tr>
-<td style="background-color: #eeeeec;"><p class="p first-child">/tweaks/popup-at-pointer</p></td>
-<td style="border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">bool</p></td>
-<td style="border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">false</p></td>
-<td style="border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">true or false to popup the Clipman menu at the mouse pointer position, works only when called from the xfce4-popup-clipman command</p></td>
-</tr>
-<tr>
-<td><p class="p first-child">/tweaks/reorder-items</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">bool</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">true</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">true or false to push the last copied text to the top of the history, useful to reorder old items</p></td>
-</tr>
-<tr>
-<td style="background-color: #eeeeec;"><p class="p first-child">/tweaks/reverse-menu-order</p></td>
-<td style="border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">bool</p></td>
-<td style="border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">false</p></td>
-<td style="border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">true or false to display the history in the reverse order</p></td>
-</tr>
-<tr>
-<td><p class="p first-child">/tweaks/skip-action-on-key-down</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">bool</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">false</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">true or false to skip the actions popup menu when the Control key is hold down at the end of the selection</p></td>
-</tr>
-</tbody>
-</table>
-</div>
-<p class="p">
-        To change a setting from a terminal type the following command-line:
-      </p>
-<p class="p">
-        <span xmlns:e="http://projectmallard.org/experimental/" class=" cmd">xfconf-query -c xfce4-panel -p /plugins/clipman/<span class=" var">property</span> -s <span class=" var">value</span></span>
-      </p>
-</div>
-</div>
-</div>
-<div class="section" id="support">
-<div class="header"><h2 class="title">Support</h2></div>
-<div class="contents"><p class="p first-child">
-      To report a bug or a feature request use the bug tracking system at <span xmlns:e="http://projectmallard.org/experimental/" class=" link"><a href="http://bugzilla.xfce.org/" title="http://bugzilla.xfce.org/">bugzilla.xfce.org</a></span>. 
-      If you have questions about the use of this software, please ask on the <span xmlns:e="http://projectmallard.org/experimental/" class=" link"><a href="https://mail.xfce.org/mailman/listinfo/xfce" title="https://mail.xfce.org/mailman/listinfo/xfce">Xfce 
-      mailing list</a></span>, or point your IRC client to <span xmlns:e="http://projectmallard.org/experimental/" class=" sys">irc.freenode.net</span> and join the channel <span xmlns:e="http://projectmallard.org/experimental/" class=" sys">#xfce</span> and ask 
-      for help.
-    </p></div>
-</div>
-<div class="section" id="about">
-<div class="header"><h2 class="title">About Clipman</h2></div>
-<div class="contents">
-<p class="p first-child">
-      <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Clipman</span> was written by Eduard Roccatello and then maintained by Nick Schermer, and nowadays it is written by
-      Mike Massonnet. Visit the <span xmlns:e="http://projectmallard.org/experimental/" class=" link"><a href="http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin" title="http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin"><span class=" app">Clipman</span>
-      Website</a></span>.
-    </p>
-<p class="p">
-      This documentation was written by Mike Massonnet ([e-mail]). Please send all your comments and
-      suggestions regarding this manual.
-      
-    </p>
-<p class="p">
-      This software is distributed under the terms of the GNU General Public License as published
-      by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-    </p>
-<p class="p">
-      You should have received a copy of the GNU General Public License along with this program;
-      if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA.
-    </p>
-</div>
-</div>
-</div>
-<div class="footbar"><div xmlns:mal="http://projectmallard.org/1.0/" xmlns:exsl="http://exslt.org/common" class="copyrights"><div class="copyright">
-          Copyright © 2009, 2011 Mike Massonnet</div></div></div>
-</body>
-</html>

=== removed directory 'doc/html/ca'
=== removed file 'doc/html/ca/index.html'
--- doc/html/ca/index.html	2012-04-09 21:26:50 +0000
+++ doc/html/ca/index.html	1970-01-01 00:00:00 +0000
@@ -1,391 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html xmlns:str="http://exslt.org/strings">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Clipman</title>
-<link rel="stylesheet" type="text/css" href="../index.css">
-</head>
-<body class="">
-<div class="headbar"></div>
-<div class="body">
-<div xmlns:mal="http://projectmallard.org/1.0/" xmlns:exsl="http://exslt.org/common" class="header">
-<h1 class="title">Clipman</h1>
-<p class="p">This manual describes <span class="app">Clipman</span> version 1.2.2.
-    </p>
-<p>Last edited: 2011-11-01.
-    </p>
-<p class="p">
-        Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free
-        Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with
-        no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. The complete license text
-        is available from the <span xmlns:e="http://projectmallard.org/experimental/" class=" link"><a href="http://www.fsf.org/" title="http://www.fsf.org/">Free Software Foundation</a></span>.
-      </p>
-</div>
-<div xmlns:mal="http://projectmallard.org/1.0/" xmlns:exsl="http://exslt.org/common" class="section toc">
-<h2 class="title">Table of Contents</h2>
-<ol>
-<li>
-<p><a href="#introduction">Introducció</a></p>
-<ul><li><p><a href="#anatomy-of-a-clipboard">Anatomia del porta-retalls</a></p></li></ul>
-</li>
-<li>
-<p><a href="#starting-clipman">Starting Clipman</a></p>
-<ul><li><p><a href="#popup-command">Ordre emergent</a></p></li></ul>
-</li>
-<li>
-<p><a href="#settings-dialog">Settings Dialog</a></p>
-<ul><li><p><a href="#settings-general">General Settings</a></p></li></ul>
-<ul><li><p><a href="#settings-actions">Actions Settings</a></p></li></ul>
-<ul><li><p><a href="#tweaks">Tweaks</a></p></li></ul>
-<ul><li><p><a href="#settings-xfconf">Xfconf</a></p></li></ul>
-</li>
-<li><p><a href="#support">Suport</a></p></li>
-<li><p><a href="#about">About Clipman</a></p></li>
-</ol>
-</div>
-<div class="section" id="introduction">
-<div class="header"><h2 class="title">Introducció</h2></div>
-<div class="contents"><p class="p first-child">
-      <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Clipman</span> is a clipboard manager for <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Xfce</span>. It keeps the clipboard contents 
-      around while it is usually lost when you close an application. It is able 
-      to handle text and images, and has a feature to execute actions on specific 
-      text by matching them against regular expressions.
-    </p></div>
-<div class="section" id="anatomy-of-a-clipboard">
-<div class="header"><h3 class="title">Anatomia del porta-retalls</h3></div>
-<div class="contents">
-<p class="p first-child">En X11 (totes les plataformes Unix) hi ha per defecte dos porta-retalls que permeten intercanviar qualsevol dada entre finestres. Un porta-retalls per defecte que es modifica amb les còpies manuals (per exemple, quan seleccioneu un fitxer i pitgeu en el botó de copiar), i un porta-retalls primari que es modifica al fer seleccions (per exemple, quan seleccioneu un camp).</p>
-<p class="p">
-        <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Clipman</span> handles only the default clipboard, but optionnaly it can also notice 
-        the selections. When it is handling the selections, the default clipboard will 
-        always be synced with it and contain the same data. By this meaning you can 
-        paste with the keyboard what you select on screen.
-      </p>
-</div>
-</div>
-</div>
-<div class="section" id="starting-clipman">
-<div class="header"><h2 class="title">Starting Clipman</h2></div>
-<div class="contents">
-<p class="p first-child">
-      <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Clipman</span> is used to keep in history a list of clipboard contents and to restore 
-      them. The history is displayed in a menu by clicking on the main icon. Within 
-      the menu it is possible to restore a text and to clear the history.
-    </p>
-<div class="figure">
-<div class="title title-figure">Clipman menu with the history</div>
-<div class="figure-contents"><div class="media media-image first-child"><img src="media/clipman-menu.png" alt=""></div></div>
-<div class="desc desc-figure">Shows the menu that popups when clicking the Clipman icon in the Xfce Panel or the notification area</div>
-</div>
-<p class="p">
-      There are two ways to run <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Clipman</span>. You can select <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Clipman</span> in the applications menu under the category
-      Utility or type <span xmlns:e="http://projectmallard.org/experimental/" class=" cmd">xfce4-clipman</span> on the command-line, or you can add it into your panel.
-      To add a new item in the panel right click the panel and select <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">Add new item...</span>.
-    </p>
-</div>
-<div class="section" id="popup-command">
-<div class="header"><h3 class="title">Ordre emergent</h3></div>
-<div class="contents"><p class="p first-child">
-        <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Clipman</span> provides the command-line tool <span xmlns:e="http://projectmallard.org/experimental/" class=" cmd">xfce4-popup-clipman</span>. When called it
-        popups the main menu. The command is practical for the <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Application Shortcuts</span>
-        available at <span xmlns:e="http://projectmallard.org/experimental/" class=" guiseq"><span class=" gui">Xfce Menu</span> ▸ <span class=" gui">Settings</span> ▸ <span class=" gui">Keyboard</span></span>.
-      </p></div>
-</div>
-</div>
-<div class="section" id="settings-dialog">
-<div class="header"><h2 class="title">Settings Dialog</h2></div>
-<div class="contents"><p class="p first-child">
-      The settings dialog is available under the <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">Properties</span> item in the right click context menu on 
-      the main icon. It allows to tweak the history and to edit actions.
-    </p></div>
-<div class="section" id="settings-general">
-<div class="header"><h3 class="title">General Settings</h3></div>
-<div class="contents">
-<p class="p first-child">
-        The following list describes the available options in the <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">General</span> tab of the <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">Settings</span> dialog.
-      </p>
-<div class="terms">
-<div class="title title-terms">List of available General settings</div>
-<div class="terms-contents"><dl class="terms">
-<dt class="item-terms first-child">Sincronització de seleccions</dt>
-<dd class="item-terms"><p class="p first-child">Sync the primary clipboard with the default clipboard in a way that it is possible to paste 
-            what gets selected.</p></dd>
-<dt class="item-terms">Desar al sortir</dt>
-<dd class="item-terms"><p class="p first-child">Keeps the history at every new session.</p></dd>
-<dt class="item-terms">Store last copied image</dt>
-<dd class="item-terms"><p class="p first-child">Allows to store one image in the history.</p></dd>
-<dt class="item-terms">Ignore selections</dt>
-<dd class="item-terms"><p class="p first-child">Prevents the primary clipboard from being inserted in the history.</p></dd>
-<dt class="item-terms">Tamany de l'historial</dt>
-<dd class="item-terms"><p class="p first-child">Sets the number of items to keep in history.</p></dd>
-</dl></div>
-</div>
-<div class="figure">
-<div class="title title-figure">General Settings</div>
-<div class="figure-contents"><div class="media media-image first-child"><img src="media/clipman-settings-general.png" alt=""></div></div>
-<div class="desc desc-figure">Diàleg de paràmetres amb la pestanya general</div>
-</div>
-</div>
-</div>
-<div class="section" id="settings-actions">
-<div class="header"><h3 class="title">Actions Settings</h3></div>
-<div class="contents">
-<p class="p first-child">
-        An action is a pair of a name and a regular expression. Each action can have one or more commands. The
-        support of actions is optional and can be enabled or disabled through the <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">Enable actions</span> option.
-      </p>
-<p class="p">
-        To add an action click the <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">Add</span> icon, to edit an action select the action and click the <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">Edit</span> icon or double click
-        the action, and to remove an action select an action and click the <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">Delete</span> icon. By adding or editing an action a
-        new dialog is opened.
-      </p>
-<p class="p">
-        To learn more about actions go to the <span xmlns:e="http://projectmallard.org/experimental/" class=" link"><a href="#action-dialog" title="">next section</a></span>.
-      </p>
-<div class="figure">
-<div class="title title-figure">Actions Settings</div>
-<div class="figure-contents"><div class="media media-image first-child"><img src="media/clipman-settings-actions.png" alt=""></div></div>
-<div class="desc desc-figure">Diàleg de configuració de la pestanya d'accions</div>
-</div>
-</div>
-<div class="section" id="actions-dialog">
-<div class="header"><h4 class="title">Diàleg d'accions</h4></div>
-<div class="contents">
-<p class="p first-child">Una acció té un nom llegible per una persona que descriu el patró amb el que ha de coincidir. Una acció ha de tenir almenys una ordre amb un nom llegible per una persona. El text de coincidència es pot reutilitzar en l'ordre.</p>
-<p class="p">
-          The actions are always matched against text selections unless specified otherwise. When the box <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">Activate only
-          on manual copy</span> is checked, the action will be matched from the default clipboard (e.g. with <span xmlns:e="http://projectmallard.org/experimental/" class=" keyseq"><span class=" key">Ctrl</span>+<span class=" key">C</span></span>).
-        </p>
-<div class="figure">
-<div class="title title-figure">Diàleg d'accions</div>
-<div class="figure-contents"><div class="media media-image first-child"><img src="media/clipman-action-dialog.png" alt=""></div></div>
-<div class="desc desc-figure">Settings dialog showing the Action Dialog when creating or editing an action</div>
-</div>
-</div>
-<div class="section" id="action-dialog-regex">
-<div class="header"><h5 class="title">Expressió regular</h5></div>
-<div class="contents">
-<p class="p first-child">
-            Basic special characters: "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">.?+*(|)[]\</span>".
-          </p>
-<div class="list"><div class="list-contents"><ul class="list">
-<li class="item-list first-child"><p class="p first-child">"<span xmlns:e="http://projectmallard.org/experimental/" class=" input">.</span>": represents a single character.</p></li>
-<li class="item-list"><p class="p first-child">"<span xmlns:e="http://projectmallard.org/experimental/" class=" input">?+*</span>": respectively means zero or one character, one or more
-              characters, and zero or more characters.</p></li>
-<li class="item-list"><p class="p first-child">"<span xmlns:e="http://projectmallard.org/experimental/" class=" input">(|)</span>": used for grouping and substitution, the vertical bar is
-              used as an OR operation.</p></li>
-<li class="item-list"><p class="p first-child">"<span xmlns:e="http://projectmallard.org/experimental/" class=" input">[^]</span>": used to match a character from a set of characters and
-              special characters, the circumflex is used at the start as a negation.</p></li>
-<li class="item-list"><p class="p first-child">"<span xmlns:e="http://projectmallard.org/experimental/" class=" input">\</span>": escapes a special character.</p></li>
-</ul></div></div>
-<p class="p">
-            Basic alphanumeric character class: "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">A-Za-z0-9</span>". Character classes
-            are used within square brackets to represent a set of characters.
-          </p>
-<div class="list">
-<div class="title title-list">Regular Expression Examples</div>
-<div class="list-contents"><ul class="list">
-<li class="item-list first-child"><p class="p first-child">"<span xmlns:e="http://projectmallard.org/experimental/" class=" input">bug ?#?[0-9]+</span>": text "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">bug</span>", zero or one
-              space, zero or one sharp character, and one or more numbers.</p></li>
-<li class="item-list"><p class="p first-child">"<span xmlns:e="http://projectmallard.org/experimental/" class=" input">(http|ftp).+\.(jpg|png|gif)</span>": text
-              "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">http</span>" or "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">ftp</span>", one or more character, a point, and the text
-              "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">jpg</span>", "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">png</span>" or "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">gif</span>".</p></li>
-<li class="item-list"><p class="p first-child">"<span xmlns:e="http://projectmallard.org/experimental/" class=" input">http://.{120}[^ ]+</span>": text "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">http://</span>", 120
-              characters, and one or more characters except a space.</p></li>
-</ul></div>
-</div>
-<div class="list">
-<div class="title title-list">External Resources</div>
-<div class="list-contents"><ul class="list"><li class="item-list first-child"><p class="p first-child"><span xmlns:e="http://projectmallard.org/experimental/" class=" link"><a href="http://en.wikipedia.org/wiki/Regular_expression" title="http://en.wikipedia.org/wiki/Regular_expression">Wikipedia
-              article about regular expressions</a></span></p></li></ul></div>
-</div>
-</div>
-</div>
-<div class="section" id="action-dialog-commands">
-<div class="header"><h5 class="title">Commands</h5></div>
-<div class="contents">
-<p class="p first-child">
-            A command can reuse one or more substitutions from the regular expression. The substitutions are represented by
-            "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">\&lt;number&gt;</span>" where <span xmlns:e="http://projectmallard.org/experimental/" class=" input">&lt;number&gt;</span> corresponds to the
-            sub-pattern within parentheses or 0 for the complete text.
-          </p>
-<p class="p">
-            For example, from the simple pattern "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">bug #(123)</span>" it is possible
-            to use "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">\0</span>" for the text "<span xmlns:e="http://projectmallard.org/experimental/" class=" output">bug #123</span>" and "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">\1</span>" 
-            for the text "<span xmlns:e="http://projectmallard.org/experimental/" class=" output">123</span>".  With the command "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">exo-open http://host/\1</span>", 
-            the real executed command would be "<span xmlns:e="http://projectmallard.org/experimental/" class=" output">exo-open http://host/123</span>".
-          </p>
-</div>
-</div>
-</div>
-</div>
-<div class="section" id="tweaks">
-<div class="header"><h3 class="title">Tweaks</h3></div>
-<div class="contents">
-<p class="p first-child">
-        The following list describes the available options in the <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">Tweaks</span> tab of the <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">Settings</span> dialog.
-      </p>
-<div class="terms">
-<div class="title title-terms">List of available Tweaks</div>
-<div class="terms-contents"><dl class="terms">
-<dt class="item-terms first-child">Paste instantly</dt>
-<dd class="item-terms"><p class="p first-child">Automatically paste a selected item from the history to the current focused window.</p></dd>
-<dt class="item-terms">Position menu at mouse pointer</dt>
-<dd class="item-terms"><p class="p first-child">Popup the menu at the mouse pointer position, only for the xfce4-popup-clipman command.</p></dd>
-<dt class="item-terms">Reorder history items</dt>
-<dd class="item-terms"><p class="p first-child">Push last copied text to the top of the history, useful to reorder old items.</p></dd>
-<dt class="item-terms">Reverse history order</dt>
-<dd class="item-terms"><p class="p first-child">Reverse order of the history shown in the menu.</p></dd>
-<dt class="item-terms">Skip actions by holding Control</dt>
-<dd class="item-terms"><p class="p first-child">When the selection is done (mouse or keyboard) and the Control key is still pressed down, the
-            popup menu for matched actions will be skipped.</p></dd>
-</dl></div>
-</div>
-<div class="figure">
-<div class="title title-figure">Tweaks</div>
-<div class="figure-contents"><div class="media media-image first-child"><img src="media/clipman-settings-tweaks.png" alt=""></div></div>
-<div class="desc desc-figure">Settings dialog with the Tweaks tab</div>
-</div>
-</div>
-</div>
-<div class="section" id="settings-xfconf">
-<div class="header"><h3 class="title">Xfconf</h3></div>
-<div class="contents">
-<p class="p first-child">
-        <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Clipman</span> uses <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Xfconf</span> to store its settings. That allows you to change the settings with the tool
-        <span xmlns:e="http://projectmallard.org/experimental/" class=" cmd">xfconf-query</span> or <span xmlns:e="http://projectmallard.org/experimental/" class=" cmd">xfce4-settings-editor</span>. The channel where <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Clipman</span> stores its settings is
-        <span xmlns:e="http://projectmallard.org/experimental/" class=" sys">xfce4-panel</span> and the base property is <span xmlns:e="http://projectmallard.org/experimental/" class=" sys">/plugins/clipman</span>. The following
-        table lists all the properties with their possible values.
-      </p>
-<div class="table">
-<div class="title title-table">Propietats de Xfconf</div>
-<div class="desc desc-table">Description of all Xfconf properties with their possible values</div>
-<table class="table" style="border-style: solid;">
-<thead><tr>
-<td><p class="p first-child">Propietat</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">Tipus</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">Defecte</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">Valors</p></td>
-</tr></thead>
-<tbody>
-<tr>
-<td style="border-top-style: solid;background-color: #eeeeec;"><p class="p first-child">/settings/add-primary-clipboard</p></td>
-<td style="border-top-style: solid;border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">bool</p></td>
-<td style="border-top-style: solid;border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">false</p></td>
-<td style="border-top-style: solid;border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">true or false to sync the primary clipboard with the default clipboard</p></td>
-</tr>
-<tr>
-<td><p class="p first-child">/settings/enable-actions</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">bool</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">false</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">true or false to enable actions</p></td>
-</tr>
-<tr>
-<td style="background-color: #eeeeec;"><p class="p first-child">/settings/history-ignore-primary-clipboard</p></td>
-<td style="border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">bool</p></td>
-<td style="border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">false</p></td>
-<td style="border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">true or false to exclude the primary clipboard from the history</p></td>
-</tr>
-<tr>
-<td><p class="p first-child">/settings/max-images-in-history</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">uint</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">0</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">0-5 nombre d'imatges a l'historial</p></td>
-</tr>
-<tr>
-<td style="background-color: #eeeeec;"><p class="p first-child">/settings/max-texts-in-history</p></td>
-<td style="border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">uint</p></td>
-<td style="border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">10</p></td>
-<td style="border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">5-100 number of texts in history</p></td>
-</tr>
-<tr>
-<td><p class="p first-child">/settings/save-on-quit</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">bool</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">true</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">true or false to restore the history at every new session</p></td>
-</tr>
-<tr>
-<td style="background-color: #eeeeec;"><p class="p first-child">/tweaks/inhibit</p></td>
-<td style="border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">bool</p></td>
-<td style="border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">false</p></td>
-<td style="border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">true or false to disable the collector</p></td>
-</tr>
-<tr>
-<td><p class="p first-child">/tweaks/paste-on-activate</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">uint</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">0</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">0 to disable, 1 to paste with Ctrl+V, or 2 to paste with Shift+Insert as soon as an item is selected from the history</p></td>
-</tr>
-<tr>
-<td style="background-color: #eeeeec;"><p class="p first-child">/tweaks/popup-at-pointer</p></td>
-<td style="border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">bool</p></td>
-<td style="border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">false</p></td>
-<td style="border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">true or false to popup the Clipman menu at the mouse pointer position, works only when called from the xfce4-popup-clipman command</p></td>
-</tr>
-<tr>
-<td><p class="p first-child">/tweaks/reorder-items</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">bool</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">true</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">true or false to push the last copied text to the top of the history, useful to reorder old items</p></td>
-</tr>
-<tr>
-<td style="background-color: #eeeeec;"><p class="p first-child">/tweaks/reverse-menu-order</p></td>
-<td style="border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">bool</p></td>
-<td style="border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">false</p></td>
-<td style="border-left-style: solid;background-color: #eeeeec;"><p class="p first-child">true or false to display the history in the reverse order</p></td>
-</tr>
-<tr>
-<td><p class="p first-child">/tweaks/skip-action-on-key-down</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">bool</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">false</p></td>
-<td style="border-left-style: solid;"><p class="p first-child">true or false to skip the actions popup menu when the Control key is hold down at the end of the selection</p></td>
-</tr>
-</tbody>
-</table>
-</div>
-<p class="p">
-        To change a setting from a terminal type the following command-line:
-      </p>
-<p class="p">
-        <span xmlns:e="http://projectmallard.org/experimental/" class=" cmd">xfconf-query -c xfce4-panel -p /plugins/clipman/<span class=" var">property</span> -s <span class=" var">value</span></span>
-      </p>
-</div>
-</div>
-</div>
-<div class="section" id="support">
-<div class="header"><h2 class="title">Suport</h2></div>
-<div class="contents"><p class="p first-child">
-      To report a bug or a feature request use the bug tracking system at <span xmlns:e="http://projectmallard.org/experimental/" class=" link"><a href="http://bugzilla.xfce.org/" title="http://bugzilla.xfce.org/">bugzilla.xfce.org</a></span>. 
-      If you have questions about the use of this software, please ask on the <span xmlns:e="http://projectmallard.org/experimental/" class=" link"><a href="https://mail.xfce.org/mailman/listinfo/xfce" title="https://mail.xfce.org/mailman/listinfo/xfce">Xfce 
-      mailing list</a></span>, or point your IRC client to <span xmlns:e="http://projectmallard.org/experimental/" class=" sys">irc.freenode.net</span> and join the channel <span xmlns:e="http://projectmallard.org/experimental/" class=" sys">#xfce</span> and ask 
-      for help.
-    </p></div>
-</div>
-<div class="section" id="about">
-<div class="header"><h2 class="title">About Clipman</h2></div>
-<div class="contents">
-<p class="p first-child">
-      <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Clipman</span> was written by Eduard Roccatello and then maintained by Nick Schermer, and nowadays it is written by
-      Mike Massonnet. Visit the <span xmlns:e="http://projectmallard.org/experimental/" class=" link"><a href="http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin" title="http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin"><span class=" app">Clipman</span>
-      Website</a></span>.
-    </p>
-<p class="p">
-      This documentation was written by Mike Massonnet ([e-mail]). Please send all your comments and
-      suggestions regarding this manual.
-      
-    </p>
-<p class="p">
-      This software is distributed under the terms of the GNU General Public License as published
-      by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-    </p>
-<p class="p">
-      You should have received a copy of the GNU General Public License along with this program;
-      if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA.
-    </p>
-</div>
-</div>
-</div>
-<div class="footbar"><div xmlns:mal="http://projectmallard.org/1.0/" xmlns:exsl="http://exslt.org/common" class="copyrights"><div class="copyright">
-          Copyright © 2009, 2011 Mike Massonnet</div></div></div>
-</body>
-</html>

=== removed directory 'doc/html/da'
=== removed file 'doc/html/da/index.html'
--- doc/html/da/index.html	2012-04-09 21:26:50 +0000
+++ doc/html/da/index.html	1970-01-01 00:00:00 +0000
@@ -1,391 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html xmlns:str="http://exslt.org/strings">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Clipman</title>
-<link rel="stylesheet" type="text/css" href="../index.css">
-</head>
-<body class="">
-<div class="headbar"></div>
-<div class="body">
-<div xmlns:mal="http://projectmallard.org/1.0/" xmlns:exsl="http://exslt.org/common" class="header">
-<h1 class="title">Clipman</h1>
-<p class="p">This manual describes <span class="app">Clipman</span> version 1.2.2.
-    </p>
-<p>Last edited: 2011-11-01.
-    </p>
-<p class="p">
-        Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free
-        Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with
-        no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. The complete license text
-        is available from the <span xmlns:e="http://projectmallard.org/experimental/" class=" link"><a href="http://www.fsf.org/" title="http://www.fsf.org/">Free Software Foundation</a></span>.
-      </p>
-</div>
-<div xmlns:mal="http://projectmallard.org/1.0/" xmlns:exsl="http://exslt.org/common" class="section toc">
-<h2 class="title">Table of Contents</h2>
-<ol>
-<li>
-<p><a href="#introduction">Introduktion</a></p>
-<ul><li><p><a href="#anatomy-of-a-clipboard">Udklipsholderens opbygning</a></p></li></ul>
-</li>
-<li>
-<p><a href="#starting-clipman">Starting Clipman</a></p>
-<ul><li><p><a href="#popup-command">Popup-kommando</a></p></li></ul>
-</li>
-<li>
-<p><a href="#settings-dialog">Settings Dialog</a></p>
-<ul><li><p><a href="#settings-general">General Settings</a></p></li></ul>
-<ul><li><p><a href="#settings-actions">Actions Settings</a></p></li></ul>
-<ul><li><p><a href="#tweaks">Tweaks</a></p></li></ul>
-<ul><li><p><a href="#settings-xfconf">Xfconf</a></p></li></ul>
-</li>
-<li><p><a href="#support">Support</a></p></li>
-<li><p><a href="#about">About Clipman</a></p></li>
-</ol>
-</div>
-<div class="section" id="introduction">
-<div class="header"><h2 class="title">Introduktion</h2></div>
-<div class="contents"><p class="p first-child">
-      <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Clipman</span> is a clipboard manager for <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Xfce</span>. It keeps the clipboard contents 
-      around while it is usually lost when you close an application. It is able 
-      to handle text and images, and has a feature to execute actions on specific 
-      text by matching them against regular expressions.
-    </p></div>
-<div class="section" id="anatomy-of-a-clipboard">
-<div class="header"><h3 class="title">Udklipsholderens opbygning</h3></div>
-<div class="contents">
-<p class="p first-child">I X11 (alle Unix platform) er der som standard to udklipsholdere til at udveksle data mellem vinduerne. En standard udklipsholder som ændres ved manuelle kopier (f.eks. når du markerer en fil og trykker på knappen kopiér), og en primær udklipsholder der ændres af markeringer (f.eks. når du markerer tekst i et felt).</p>
-<p class="p">
-        <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Clipman</span> handles only the default clipboard, but optionnaly it can also notice 
-        the selections. When it is handling the selections, the default clipboard will 
-        always be synced with it and contain the same data. By this meaning you can 
-        paste with the keyboard what you select on screen.
-      </p>
-</div>
-</div>
-</div>
-<div class="section" id="starting-clipman">
-<div class="header"><h2 class="title">Starting Clipman</h2></div>
-<div class="contents">
-<p class="p first-child">
-      <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Clipman</span> is used to keep in history a list of clipboard contents and to restore 
-      them. The history is displayed in a menu by clicking on the main icon. Within 
-      the menu it is possible to restore a text and to clear the history.
-    </p>
-<div class="figure">
-<div class="title title-figure">Clipman menu with the history</div>
-<div class="figure-contents"><div class="media media-image first-child"><img src="media/clipman-menu.png" alt=""></div></div>
-<div class="desc desc-figure">Shows the menu that popups when clicking the Clipman icon in the Xfce Panel or the notification area</div>
-</div>
-<p class="p">
-      There are two ways to run <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Clipman</span>. You can select <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Clipman</span> in the applications menu under the category
-      Utility or type <span xmlns:e="http://projectmallard.org/experimental/" class=" cmd">xfce4-clipman</span> on the command-line, or you can add it into your panel.
-      To add a new item in the panel right click the panel and select <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">Add new item...</span>.
-    </p>
-</div>
-<div class="section" id="popup-command">
-<div class="header"><h3 class="title">Popup-kommando</h3></div>
-<div class="contents"><p class="p first-child">
-        <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Clipman</span> provides the command-line tool <span xmlns:e="http://projectmallard.org/experimental/" class=" cmd">xfce4-popup-clipman</span>. When called it
-        popups the main menu. The command is practical for the <span xmlns:e="http://projectmallard.org/experimental/" class=" app">Application Shortcuts</span>
-        available at <span xmlns:e="http://projectmallard.org/experimental/" class=" guiseq"><span class=" gui">Xfce Menu</span> ▸ <span class=" gui">Settings</span> ▸ <span class=" gui">Keyboard</span></span>.
-      </p></div>
-</div>
-</div>
-<div class="section" id="settings-dialog">
-<div class="header"><h2 class="title">Settings Dialog</h2></div>
-<div class="contents"><p class="p first-child">
-      The settings dialog is available under the <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">Properties</span> item in the right click context menu on 
-      the main icon. It allows to tweak the history and to edit actions.
-    </p></div>
-<div class="section" id="settings-general">
-<div class="header"><h3 class="title">General Settings</h3></div>
-<div class="contents">
-<p class="p first-child">
-        The following list describes the available options in the <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">General</span> tab of the <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">Settings</span> dialog.
-      </p>
-<div class="terms">
-<div class="title title-terms">List of available General settings</div>
-<div class="terms-contents"><dl class="terms">
-<dt class="item-terms first-child">Synkronisér markeringer</dt>
-<dd class="item-terms"><p class="p first-child">Sync the primary clipboard with the default clipboard in a way that it is possible to paste 
-            what gets selected.</p></dd>
-<dt class="item-terms">Gem ved afslutning</dt>
-<dd class="item-terms"><p class="p first-child">Keeps the history at every new session.</p></dd>
-<dt class="item-terms">Store last copied image</dt>
-<dd class="item-terms"><p class="p first-child">Allows to store one image in the history.</p></dd>
-<dt class="item-terms">Ignore selections</dt>
-<dd class="item-terms"><p class="p first-child">Prevents the primary clipboard from being inserted in the history.</p></dd>
-<dt class="item-terms">Størrelsen på historikken</dt>
-<dd class="item-terms"><p class="p first-child">Sets the number of items to keep in history.</p></dd>
-</dl></div>
-</div>
-<div class="figure">
-<div class="title title-figure">General Settings</div>
-<div class="figure-contents"><div class="media media-image first-child"><img src="media/clipman-settings-general.png" alt=""></div></div>
-<div class="desc desc-figure">Indstillingsvinduet i fanebladet Generelt</div>
-</div>
-</div>
-</div>
-<div class="section" id="settings-actions">
-<div class="header"><h3 class="title">Actions Settings</h3></div>
-<div class="contents">
-<p class="p first-child">
-        An action is a pair of a name and a regular expression. Each action can have one or more commands. The
-        support of actions is optional and can be enabled or disabled through the <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">Enable actions</span> option.
-      </p>
-<p class="p">
-        To add an action click the <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">Add</span> icon, to edit an action select the action and click the <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">Edit</span> icon or double click
-        the action, and to remove an action select an action and click the <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">Delete</span> icon. By adding or editing an action a
-        new dialog is opened.
-      </p>
-<p class="p">
-        To learn more about actions go to the <span xmlns:e="http://projectmallard.org/experimental/" class=" link"><a href="#action-dialog" title="">next section</a></span>.
-      </p>
-<div class="figure">
-<div class="title title-figure">Actions Settings</div>
-<div class="figure-contents"><div class="media media-image first-child"><img src="media/clipman-settings-actions.png" alt=""></div></div>
-<div class="desc desc-figure">Indstillingsvinduet i fanebladet Handlinger</div>
-</div>
-</div>
-<div class="section" id="actions-dialog">
-<div class="header"><h4 class="title">Handlingsvindue</h4></div>
-<div class="contents">
-<p class="p first-child">En handling har et navn, der er læseligt for mennesker, der beskriver det mønster det skal sammenlignes med. En handling skal have mindst én kommando som også har et navn, der er læseligt for mennesker. Den sammenlignede tekst kan blive genbrugt i kommandoen.</p>
-<p class="p">
-          The actions are always matched against text selections unless specified otherwise. When the box <span xmlns:e="http://projectmallard.org/experimental/" class=" gui">Activate only
-          on manual copy</span> is checked, the action will be matched from the default clipboard (e.g. with <span xmlns:e="http://projectmallard.org/experimental/" class=" keyseq"><span class=" key">Ctrl</span>+<span class=" key">C</span></span>).
-        </p>
-<div class="figure">
-<div class="title title-figure">Handlingsvindue</div>
-<div class="figure-contents"><div class="media media-image first-child"><img src="media/clipman-action-dialog.png" alt=""></div></div>
-<div class="desc desc-figure">Settings dialog showing the Action Dialog when creating or editing an action</div>
-</div>
-</div>
-<div class="section" id="action-dialog-regex">
-<div class="header"><h5 class="title">Regulært udtryk</h5></div>
-<div class="contents">
-<p class="p first-child">
-            Basic special characters: "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">.?+*(|)[]\</span>".
-          </p>
-<div class="list"><div class="list-contents"><ul class="list">
-<li class="item-list first-child"><p class="p first-child">"<span xmlns:e="http://projectmallard.org/experimental/" class=" input">.</span>": represents a single character.</p></li>
-<li class="item-list"><p class="p first-child">"<span xmlns:e="http://projectmallard.org/experimental/" class=" input">?+*</span>": respectively means zero or one character, one or more
-              characters, and zero or more characters.</p></li>
-<li class="item-list"><p class="p first-child">"<span xmlns:e="http://projectmallard.org/experimental/" class=" input">(|)</span>": used for grouping and substitution, the vertical bar is
-              used as an OR operation.</p></li>
-<li class="item-list"><p class="p first-child">"<span xmlns:e="http://projectmallard.org/experimental/" class=" input">[^]</span>": used to match a character from a set of characters and
-              special characters, the circumflex is used at the start as a negation.</p></li>
-<li class="item-list"><p class="p first-child">"<span xmlns:e="http://projectmallard.org/experimental/" class=" input">\</span>": escapes a special character.</p></li>
-</ul></div></div>
-<p class="p">
-            Basic alphanumeric character class: "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">A-Za-z0-9</span>". Character classes
-            are used within square brackets to represent a set of characters.
-          </p>
-<div class="list">
-<div class="title title-list">Regular Expression Examples</div>
-<div class="list-contents"><ul class="list">
-<li class="item-list first-child"><p class="p first-child">"<span xmlns:e="http://projectmallard.org/experimental/" class=" input">bug ?#?[0-9]+</span>": text "<span xmlns:e="http://projectmallard.org/experimental/" class=" input">bug</span>", zero or one
-              space, zero or one sharp character, and one or more numbers.</p></li>