119 changed files with 8571 additions and 10926 deletions
--- a/14
+++ b/14
@ -1,26 +1,12 @@
 # Version number followed by the release date
 1.3.1.0 2022/10/8
  * Fix a layout assertion
  * Keep running when spell checking fails
  + Support libenchant-2
  * Fix a DDE error on Windows (Bug #236)
  * gdk_x11_get_server_time crashes when an invalid window is passed
  * Migrate to PCRE2 (Miriam Ruiz)
 1.3.0.0 2020/08/15
  * Link against wxWidgets 3.0
  * SSE2 compatible CPUs are required (xerces-c++)
 1.2.1.5
  * Use the same default encoding to read and write files (Bug #234)
  * Only show SSE2 warning in debug build
  * Bug #228 Misleading translation when file was changed externally, may lead to data loss
  * Bug #227 Dead Link: Help > Forum
  * Bug #221 Patch for building with C++11 (Roger Leigh)
  + Added Mac port
  * Update the iconized frame window when opening files from the command line
  * Fix supporting for filenames with non-ASCII characters
 1.2.1.4
  + Feature #171 Fold element does not fold following whitespace
--- a/Makefile.in
+++ b/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -89,11 +89,10 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
@ -137,7 +136,7 @@ am__recursive_targets = \
  $(RECURSIVE_CLEAN_TARGETS) \
  $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	cscope distdir distdir-am dist dist-all distcheck
+	cscope distdir dist dist-all distcheck
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@ -155,10 +154,13 @@ am__define_uniq_tagged_files = \
  unique=`for i in $$list; do \
    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in AUTHORS COPYING ChangeLog \
-	INSTALL NEWS README.md TODO compile config.guess config.rpath \
+	INSTALL NEWS TODO compile config.guess config.rpath config.sub \
-	config.sub depcomp install-sh ltmain.sh missing
+	depcomp install-sh ltmain.sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@ -197,8 +199,6 @@ am__relativize = \
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 DIST_TARGETS = dist-gzip
 # Exists only to be overridden by the user if desired.
 AM_DISTCHECK_DVI_TARGET = dvi
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@ -217,9 +217,8 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CSCOPE = @CSCOPE@
 CTAGS = @CTAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
@ -237,7 +236,6 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 ENCHANT_CFLAGS = @ENCHANT_CFLAGS@
 ENCHANT_LIBS = @ENCHANT_LIBS@
 ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@ -286,8 +284,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCRE2_CFLAGS = @PCRE2_CFLAGS@
 PCRE2_LIBS = @PCRE2_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@ -300,10 +296,6 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WX_LIBS = @WX_LIBS@
 XGETTEXT = @XGETTEXT@
 XML2_CFLAGS = @XML2_CFLAGS@
 XML2_LIBS = @XML2_LIBS@
 XSLT_CFLAGS = @XSLT_CFLAGS@
 XSLT_LIBS = @XSLT_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@ -394,8 +386,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' $(SHELL) ./config.status'; \
 	    $(SHELL) ./config.status;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@ -521,10 +513,8 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@ -604,10 +594,6 @@ dist-xz: distdir
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__post_remove_distdir)
 dist-zstd: distdir
 	tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
 	$(am__post_remove_distdir)
 dist-tarZ: distdir
 	@echo WARNING: "Support for distribution archives compressed with" \
 		       "legacy program 'compress' is deprecated." >&2
@ -650,8 +636,6 @@ distcheck: dist
 	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	*.tar.zst*) \
 	  zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
 	esac
 	chmod -R a-w $(distdir)
 	chmod u+w $(distdir)
@ -667,7 +651,7 @@ distcheck: dist
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
 	  && $(MAKE) $(AM_MAKEFLAGS) install \
 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
@ -829,18 +813,17 @@ uninstall-am:
 	am--refresh check check-am clean clean-cscope clean-generic \
 	clean-libtool cscope cscopelist-am ctags ctags-am dist \
 	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
-	dist-xz dist-zip dist-zstd distcheck distclean \
+	dist-xz dist-zip distcheck distclean distclean-generic \
-	distclean-generic distclean-libtool distclean-tags \
+	distclean-libtool distclean-tags distcleancheck distdir \
-	distcleancheck distdir distuninstallcheck dvi dvi-am html \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
-	html-am info info-am install install-am install-data \
+	install install-am install-data install-data-am install-dvi \
-	install-data-am install-dvi install-dvi-am install-exec \
+	install-dvi-am install-exec install-exec-am install-html \
-	install-exec-am install-html install-html-am install-info \
+	install-html-am install-info install-info-am install-man \
-	install-info-am install-man install-pdf install-pdf-am \
+	install-pdf install-pdf-am install-ps install-ps-am \
-	install-ps install-ps-am install-strip installcheck \
+	install-strip installcheck installcheck-am installdirs \
-	installcheck-am installdirs installdirs-am maintainer-clean \
+	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	ps ps-am tags tags-am uninstall uninstall-am
 	uninstall-am
 .PRECIOUS: Makefile
--- a/aclocal.m4
+++ b/aclocal.m4
@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -14,15 +14,205 @@
 m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],,
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
-[m4_warning([this file was generated for autoconf 2.71.
+[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'.])])
 # pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
 # serial 12 (pkg-config-0.29.2)
 dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
 # serial 42 IT_PROG_INTLTOOL
 AC_DEFUN([IT_PROG_INTLTOOL], [
 AC_PREREQ([2.50])dnl
 AC_REQUIRE([AM_NLS])dnl
 case "$am__api_version" in
    1.[01234])
 	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
    ;;
    *)
    ;;
 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])
    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.])
 fi
 AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
 AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
 AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
 if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
    AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
 fi
 if test -z "$AM_DEFAULT_VERBOSITY"; then
  AM_DEFAULT_VERBOSITY=1
 fi
 AC_SUBST([AM_DEFAULT_VERBOSITY])
 INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
 INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
 INTLTOOL__v_MERGE_0='@echo "  ITMRG " [$]@;'
 AC_SUBST(INTLTOOL_V_MERGE)
 AC_SUBST(INTLTOOL__v_MERGE_)
 AC_SUBST(INTLTOOL__v_MERGE_0)
 INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
 intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
 intltool__v_merge_options_0='-q'
 AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
 AC_SUBST(intltool__v_merge_options_)
 AC_SUBST(intltool__v_merge_options_0)
  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
 INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@'
     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
 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 $< [$]@' 
  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
 _IT_SUBST(INTLTOOL_DESKTOP_RULE)
 _IT_SUBST(INTLTOOL_DIRECTORY_RULE)
 _IT_SUBST(INTLTOOL_KEYS_RULE)
 _IT_SUBST(INTLTOOL_PROP_RULE)
 _IT_SUBST(INTLTOOL_OAF_RULE)
 _IT_SUBST(INTLTOOL_PONG_RULE)
 _IT_SUBST(INTLTOOL_SERVER_RULE)
 _IT_SUBST(INTLTOOL_SHEET_RULE)
 _IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
 _IT_SUBST(INTLTOOL_UI_RULE)
 _IT_SUBST(INTLTOOL_XAM_RULE)
 _IT_SUBST(INTLTOOL_KBD_RULE)
 _IT_SUBST(INTLTOOL_XML_RULE)
 _IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
 _IT_SUBST(INTLTOOL_CAVES_RULE)
 _IT_SUBST(INTLTOOL_SCHEMAS_RULE)
 _IT_SUBST(INTLTOOL_THEME_RULE)
 _IT_SUBST(INTLTOOL_SERVICE_RULE)
 _IT_SUBST(INTLTOOL_POLICY_RULE)
 # Check the gettext tools to make sure they are GNU
 AC_PATH_PROG(XGETTEXT, xgettext)
 AC_PATH_PROG(MSGMERGE, msgmerge)
 AC_PATH_PROG(MSGFMT, msgfmt)
 AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
 if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
 fi
 xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
 mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
 mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
 if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
 fi
 AC_PATH_PROG(INTLTOOL_PERL, perl)
 if test -z "$INTLTOOL_PERL"; then
   AC_MSG_ERROR([perl not found])
 fi
 AC_MSG_CHECKING([for perl >= 5.8.1])
 $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
 if test $? -ne 0; then
   AC_MSG_ERROR([perl 5.8.1 is required for intltool])
 else
   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
   AC_MSG_RESULT([$IT_PERL_VERSION])
 fi
 if test "x$2" != "xno-xml"; then
   AC_MSG_CHECKING([for XML::Parser])
   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
       AC_MSG_RESULT([ok])
   else
       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
   fi
 fi
 # Substitute ALL_LINGUAS so we can use it in po/Makefile
 AC_SUBST(ALL_LINGUAS)
 IT_PO_SUBDIR([po])
 ])
 # IT_PO_SUBDIR(DIRNAME)
 # ---------------------
 # All po subdirs have to be declared with this macro; the subdir "po" is
 # declared by IT_PROG_INTLTOOL.
 #
 AC_DEFUN([IT_PO_SUBDIR],
 [AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
 dnl
 dnl The following CONFIG_COMMANDS should be executed at the very end
 dnl of config.status.
 AC_CONFIG_COMMANDS_PRE([
  AC_CONFIG_COMMANDS([$1/stamp-it], [
    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
       AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
    fi
    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
    >"$1/stamp-it.tmp"
    [sed '/^#/d
 	 s/^[[].*] *//
 	 /^[ 	]*$/d
 	'"s|^|	$ac_top_srcdir/|" \
      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
    ]
    [sed '/^POTFILES =/,/[^\\]$/ {
 		/^POTFILES =/!d
 		r $1/POTFILES
 	  }
 	 ' "$1/Makefile.in" >"$1/Makefile"]
    rm -f "$1/Makefile.tmp"
    mv "$1/stamp-it.tmp" "$1/stamp-it"
  ])
 ])dnl
 ])
 # _IT_SUBST(VARIABLE)
 # -------------------
 # Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
 #
 AC_DEFUN([_IT_SUBST],
 [
 AC_SUBST([$1])
 m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
 ]
 )
 # deprecated macros
 AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
 # A hint is needed for aclocal from Automake <= 1.9.4:
 # AC_DEFUN([AC_PROG_INTLTOOL], ...)
 dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
 dnl serial 11 (pkg-config-0.29.1)
 dnl
 dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
 dnl
@ -63,7 +253,7 @@ dnl
 dnl See the "Since" comment for each macro you use to see what version
 dnl of the macros you require.
 m4_defun([PKG_PREREQ],
-[m4_define([PKG_MACROS_VERSION], [0.29.2])
+[m4_define([PKG_MACROS_VERSION], [0.29.1])
 m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
 ])dnl PKG_PREREQ
@ -164,7 +354,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
 AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
 pkg_failed=no
-AC_MSG_CHECKING([for $2])
+AC_MSG_CHECKING([for $1])
 _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
 _PKG_CONFIG([$1][_LIBS], [libs], [$2])
@ -174,7 +364,7 @@ and $1[]_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.])
 if test $pkg_failed = yes; then
-        AC_MSG_RESULT([no])
+   	AC_MSG_RESULT([no])
        _PKG_SHORT_ERRORS_SUPPORTED
        if test $_pkg_short_errors_supported = yes; then
 	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
@ -195,7 +385,7 @@ installed software in a non-standard prefix.
 _PKG_TEXT])[]dnl
        ])
 elif test $pkg_failed = untried; then
-        AC_MSG_RESULT([no])
+     	AC_MSG_RESULT([no])
 	m4_default([$4], [AC_MSG_FAILURE(
 [The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@ -296,7 +486,7 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
 AS_VAR_IF([$1], [""], [$5], [$4])dnl
 ])dnl PKG_CHECK_VAR
-# Copyright (C) 2002-2021 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -308,10 +498,10 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.16'
+[am__api_version='1.15'
 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.16.5], [],
+m4_if([$1], [1.15.1], [],
      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
@ -327,14 +517,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # 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.16.5])dnl
+[AM_AUTOMAKE_VERSION([1.15.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -386,7 +576,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
 # AM_CONDITIONAL                                            -*- Autoconf -*-
-# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -417,7 +607,7 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -608,12 +798,13 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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.
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@ -621,43 +812,49 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
  # Older Autoconf quotes --file arguments for eval, but not when files
  # are listed without --file.  Let's play safe and only enable the eval
  # if we detect the quoting.
-  # TODO: see whether this extra hack can be removed once we start
+  case $CONFIG_FILES in
-  # requiring Autoconf 2.70 or later.
+  *\'*) eval set x "$CONFIG_FILES" ;;
-  AS_CASE([$CONFIG_FILES],
+  *)   set x $CONFIG_FILES ;;
-          [*\'*], [eval set x "$CONFIG_FILES"],
+  esac
          [*], [set x $CONFIG_FILES])
  shift
-  # Used to flag and report bootstrapping failures.
+  for mf
  am_rc=0
  for am_mf
  do
    # Strip MF so we end up with the name of the file.
-    am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile which includes
+    # Check whether this is an Automake generated Makefile or not.
-    # dependency-tracking related rules and includes.
+    # We used to match only the files named 'Makefile.in', but
-    # Grep'ing the whole file directly is not great: AIX grep has a line
+    # some people rename them; so instead we look at the file content.
    # Grep'ing the first line is not enough: some people post-process
    # each Makefile.in and add a new line on top of each file to say so.
    # Grep'ing the whole file is not good either: AIX grep has a line
    # limit of 2048, but all sed's we know have understand at least 4000.
-    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      || continue
+      dirpart=`AS_DIRNAME("$mf")`
-    am_dirpart=`AS_DIRNAME(["$am_mf"])`
+    else
-    am_filepart=`AS_BASENAME(["$am_mf"])`
+      continue
-    AM_RUN_LOG([cd "$am_dirpart" \
+    fi
-      && sed -e '/# am--include-marker/d' "$am_filepart" \
+    # Extract the definition of DEPDIR, am__include, and am__quote
-        | $MAKE -f - am--depfiles]) || am_rc=$?
+    # from the Makefile without running 'make'.
    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
    test -z "$DEPDIR" && continue
    am__include=`sed -n 's/^am__include = //p' < "$mf"`
    test -z "$am__include" && continue
    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
    # Find all dependency output files, they are included files with
    # $(DEPDIR) in their names.  We invoke sed twice because it is the
    # simplest approach to changing $(DEPDIR) to its actual value in the
    # expansion.
    for file in `sed -n "
      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
 	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
      # Make sure the directory exists.
      test -f "$dirpart/$file" && continue
      fdir=`AS_DIRNAME(["$file"])`
      AS_MKDIR_P([$dirpart/$fdir])
      # echo "creating $dirpart/$file"
      echo '# dummy' > "$dirpart/$file"
    done
  done
  if test $am_rc -ne 0; then
    AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
    for automatic dependency tracking.  If GNU make was not used, consider
    re-running the configure script with MAKE="gmake" (or whatever is
    necessary).  You can also try re-running configure with the
    '--disable-dependency-tracking' option to at least be able to build
    the package (albeit without support for automatic dependency tracking).])
  fi
  AS_UNSET([am_dirpart])
  AS_UNSET([am_filepart])
  AS_UNSET([am_mf])
  AS_UNSET([am_rc])
  rm -f conftest-deps.mk
 }
 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
@ -666,17 +863,18 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 # -----------------------------
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
-# This code is only required when automatic dependency tracking is enabled.
+# This code is only required when automatic dependency tracking
-# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
+# is enabled.  FIXME.  This creates each '.P' file that we will
-# order to bootstrap the dependency handling code.
+# need in order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 # Do all the work for Automake.                             -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -704,10 +902,6 @@ m4_defn([AC_PROG_CC])
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
 [AC_PREREQ([2.65])dnl
 m4_ifdef([_$0_ALREADY_INIT],
  [m4_fatal([$0 expanded multiple times
 ]m4_defn([_$0_ALREADY_INIT]))],
  [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@ -744,7 +938,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
 [_AM_SET_OPTIONS([$1])dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
 m4_if(
-  m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]),
+  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
  [ok:ok],,
  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
 AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
@ -767,8 +961,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
 # For better backward compatibility.  To be removed once Automake 1.9.x
 # dies out for good.  For more background, see:
-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
 # We need awk for the "check" target (and possibly the TAP driver).  The
 # system "awk" is bad on some platforms.
@ -796,20 +990,6 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
 		  [m4_define([AC_PROG_OBJCXX],
 			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
 ])
 # Variables for tags utilities; see am/tags.am
 if test -z "$CTAGS"; then
  CTAGS=ctags
 fi
 AC_SUBST([CTAGS])
 if test -z "$ETAGS"; then
  ETAGS=etags
 fi
 AC_SUBST([ETAGS])
 if test -z "$CSCOPE"; then
  CSCOPE=cscope
 fi
 AC_SUBST([CSCOPE])
 AC_REQUIRE([AM_SILENT_RULES])dnl
 dnl The testsuite driver may need to know about EXEEXT, so add the
 dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
@ -849,7 +1029,7 @@ END
 Aborting the configuration process, to ensure you take notice of the issue.
 You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
 If you want to complete the configuration process using your problematic
 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@ -891,7 +1071,7 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -912,7 +1092,7 @@ if test x"${install_sh+set}" != xset; then
 fi
 AC_SUBST([install_sh])])
-# Copyright (C) 2003-2021 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -933,7 +1113,7 @@ AC_SUBST([am__leading_dot])])
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -941,42 +1121,49 @@ AC_SUBST([am__leading_dot])])
 # AM_MAKE_INCLUDE()
 # -----------------
-# Check whether make has an 'include' directive that can support all
+# Check to see how make treats includes.
 # the idioms we need for our automatic dependency tracking code.
 AC_DEFUN([AM_MAKE_INCLUDE],
-[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
+[am_make=${MAKE-make}
-cat > confinc.mk << 'END'
+cat > confinc << 'END'
 am__doit:
-	@echo this is the am__doit target >confinc.out
+	@echo this is the am__doit target
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
 AC_MSG_CHECKING([for style of include used by $am_make])
 am__include="#"
 am__quote=
-# BSD make does it like this.
+_am_result=none
-echo '.include "confinc.mk" # ignored' > confmf.BSD
+# First try GNU make style include.
-# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo "include confinc" > confmf
-echo 'include confinc.mk # ignored' > confmf.GNU
+# Ignore all kinds of additional output from 'make'.
-_am_result=no
+case `$am_make -s -f confmf 2> /dev/null` in #(
-for s in GNU BSD; do
+*the\ am__doit\ target*)
-  AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
+  am__include=include
-  AS_CASE([$?:`cat confinc.out 2>/dev/null`],
+  am__quote=
-      ['0:this is the am__doit target'],
+  _am_result=GNU
-      [AS_CASE([$s],
+  ;;
-          [BSD], [am__include='.include' am__quote='"'],
+esac
-          [am__include='include' am__quote=''])])
+# Now try BSD make style include.
-  if test "$am__include" != "#"; then
+if test "$am__include" = "#"; then
-    _am_result="yes ($s style)"
+   echo '.include "confinc"' > confmf
-    break
+   case `$am_make -s -f confmf 2> /dev/null` in #(
-  fi
+   *the\ am__doit\ target*)
-done
+     am__include=.include
-rm -f confinc.* confmf.*
+     am__quote="\""
-AC_MSG_RESULT([${_am_result}])
+     _am_result=BSD
-AC_SUBST([am__include])])
+     ;;
-AC_SUBST([am__quote])])
+   esac
 fi
 AC_SUBST([am__include])
 AC_SUBST([am__quote])
 AC_MSG_RESULT([$_am_result])
 rm -f confinc confmf
 ])
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -997,7 +1184,12 @@ AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
 if test x"${MISSING+set}" != xset; then
-  MISSING="\${SHELL} '$am_aux_dir/missing'"
+  case $am_aux_dir in
  *\ * | *\	*)
    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
  *)
    MISSING="\${SHELL} $am_aux_dir/missing" ;;
  esac
 fi
 # Use eval to expand $SHELL
 if eval "$MISSING --is-lightweight"; then
@ -1010,7 +1202,7 @@ fi
 # Helper functions for option handling.                     -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -1039,7 +1231,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -1086,7 +1278,7 @@ AC_LANG_POP([C])])
 # For backward compatibility.
 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -1105,7 +1297,7 @@ AC_DEFUN([AM_RUN_LOG],
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -1186,7 +1378,7 @@ AC_CONFIG_COMMANDS_PRE(
 rm -f conftest.file
 ])
-# Copyright (C) 2009-2021 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -1246,7 +1438,7 @@ AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -1274,7 +1466,7 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2021 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -1293,7 +1485,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 # Check how to create a tarball.                            -*- Autoconf -*-
-# Copyright (C) 2004-2021 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -1424,7 +1616,6 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 m4_include([m4/intltool.m4])
 m4_include([m4/libtool.m4])
 m4_include([m4/ltoptions.m4])
 m4_include([m4/ltsugar.m4])
--- a/autogen.sh
+++ b/autogen.sh
@ -3,8 +3,8 @@
 export WANT_AUTOCONF_2_5="1"
 export WANT_AUTOMAKE_1_7="1"
-libtoolize --copy
+aclocal
-intltoolize --copy --force
+libtoolize --automake --force --copy
-aclocal -I m4
+automake -a -c
 autoconf
-automake --add-missing --copy
+
--- a/348
+++ b/348
@ -1,348 +0,0 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 scriptversion=2018-03-07.03; # UTC
 # Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # 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
 # the Free Software Foundation; either version 2, or (at your option)
 # any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # 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, see <https://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
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 # This file is maintained in Automake, please report
 # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.
 nl='
 '
 # We need space, tab and new line, in precisely that order.  Quoting is
 # there to prevent tools from complaining about whitespace usage.
 IFS=" ""	$nl"
 file_conv=
 # func_file_conv build_file lazy
 # Convert a $build file to $host form and store it in $file
 # Currently only supports Windows hosts. If the determined conversion
 # type is listed in (the comma separated) LAZY, no conversion will
 # take place.
 func_file_conv ()
 {
  file=$1
  case $file in
    / | /[!/]*) # absolute file, and not a UNC file
      if test -z "$file_conv"; then
 	# lazily determine how to convert abs files
 	case `uname -s` in
 	  MINGW*)
 	    file_conv=mingw
 	    ;;
 	  CYGWIN* | MSYS*)
 	    file_conv=cygwin
 	    ;;
 	  *)
 	    file_conv=wine
 	    ;;
 	esac
      fi
      case $file_conv/,$2, in
 	*,$file_conv,*)
 	  ;;
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
 	cygwin/* | msys/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
 	  file=`winepath -w "$file" || echo "$file"`
 	  ;;
      esac
      ;;
  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
    if test -f "$dir/lib$lib.a"; then
      found=yes
      lib=$dir/lib$lib.a
      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 ()
 {
  # Assume a capable shell
  lib_path=
  shared=:
  linker_opts=
  for arg
  do
    if test -n "$eat"; then
      eat=
    else
      case $1 in
 	-o)
 	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
 	  eat=1
 	  case $2 in
 	    *.o | *.[oO][bB][jJ])
 	      func_file_conv "$2"
 	      set x "$@" -Fo"$file"
 	      shift
 	      ;;
 	    *)
 	      func_file_conv "$2"
 	      set x "$@" -Fe"$file"
 	      shift
 	      ;;
 	  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*)
 	  func_cl_dashl "${1#-l}"
 	  set x "$@" "$lib"
 	  shift
 	  ;;
 	-L)
 	  eat=1
 	  func_cl_dashL "$2"
 	  ;;
 	-L*)
 	  func_cl_dashL "${1#-L}"
 	  ;;
 	-static)
 	  shared=false
 	  ;;
 	-Wl,*)
 	  arg=${1#-Wl,}
 	  save_ifs="$IFS"; IFS=','
 	  for flag in $arg; do
 	    IFS="$save_ifs"
 	    linker_opts="$linker_opts $flag"
 	  done
 	  IFS="$save_ifs"
 	  ;;
 	-Xlinker)
 	  eat=1
 	  linker_opts="$linker_opts $2"
 	  ;;
 	-*)
 	  set x "$@" "$1"
 	  shift
 	  ;;
 	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
 	  func_file_conv "$1"
 	  set x "$@" -Tp"$file"
 	  shift
 	  ;;
 	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
 	  func_file_conv "$1" mingw
 	  set x "$@" "$file"
 	  shift
 	  ;;
 	*)
 	  set x "$@" "$1"
 	  shift
 	  ;;
      esac
    fi
    shift
  done
  if test -n "$linker_opts"; then
    linker_opts="-link$linker_opts"
  fi
  exec "$@" $linker_opts
  exit 1
 }
 eat=
 case $1 in
  '')
     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
     exit 1;
     ;;
  -h | --h*)
    cat <<\EOF
 Usage: compile [--help] [--version] PROGRAM [ARGS]
 Wrapper for compilers which do not understand '-c -o'.
 Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
 arguments, and rename the output as expected.
 If you are trying to build a whole package this is not the
 right script to run: please start by reading the file 'INSTALL'.
 Report bugs to <bug-automake@gnu.org>.
 EOF
    exit $?
    ;;
  -v | --v*)
    echo "compile $scriptversion"
    exit $?
    ;;
  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
    func_cl_wrapper "$@"      # Doesn't return...
    ;;
 esac
 ofile=
 cfile=
 for arg
 do
  if test -n "$eat"; then
    eat=
  else
    case $1 in
      -o)
 	# configure might choose to run compile as 'compile cc -o foo foo.c'.
 	# So we strip '-o arg' only if arg is an object.
 	eat=1
 	case $2 in
 	  *.o | *.obj)
 	    ofile=$2
 	    ;;
 	  *)
 	    set x "$@" -o "$2"
 	    shift
 	    ;;
 	esac
 	;;
      *.c)
 	cfile=$1
 	set x "$@" "$1"
 	shift
 	;;
      *)
 	set x "$@" "$1"
 	shift
 	;;
    esac
  fi
  shift
 done
 if test -z "$ofile" || test -z "$cfile"; then
  # If no '-o' option was seen then we might have been invoked from a
  # pattern rule where we don't need one.  That is ok -- this is a
  # normal compilation that the losing compiler can handle.  If no
  # '.c' file was seen then we are probably linking.  That is also
  # ok.
  exec "$@"
 fi
 # Name of file we expect compiler to create.
 cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
 # Create the lock directory.
 # Note: use '[/\\:.-]' here to ensure that we don't use the same name
 # that we are using for the .o file.  Also, base the name on the expected
 # object file name, since that is what matters with a parallel build.
 lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
 while true; do
  if mkdir "$lockdir" >/dev/null 2>&1; then
    break
  fi
  sleep 1
 done
 # FIXME: race condition here if user kills between mkdir and trap.
 trap "rmdir '$lockdir'; exit 1" 1 2 15
 # Run the compile.
 "$@"
 ret=$?
 if test -f "$cofile"; then
  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
 elif test -f "${cofile}bj"; then
  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
 fi
 rmdir "$lockdir"
 exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
 # eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
--- a/config.guess
+++ b/config.guess
--- a/config.sub
+++ b/config.sub
--- a/7253
+++ b/7253
--- a/configure.ac
+++ b/configure.ac
@ -1,4 +1,4 @@
-AC_INIT([xmlcopyeditor], [1.3.1.0])
+AC_INIT([xmlcopyeditor], [1.2.1.5])
 AC_CONFIG_SRCDIR([src/xmlcopyeditor.cpp])
 AC_CONFIG_MACRO_DIR([m4])
@ -14,15 +14,15 @@ IT_PROG_INTLTOOL(0.40.0)
 AC_PROG_CXX
 AC_PROG_INSTALL
-
+AC_LIBTOOL_DLOPEN
-LT_INIT
+AC_PROG_LIBTOOL
 PKG_PROG_PKG_CONFIG
 CPPFLAGS="$CPPFLAGS -Wall -g -fexceptions"
 CXXFLAGS?=
 WXCONFIG=wx-config
 LIBXMLCONFIG=xml2-config
 LIBXSLTCONFIG=xslt-config
 AC_ARG_WITH(wx-config,
 [[  --with-wx-config=FILE     Use the given path to wx-config when determining
@ -59,8 +59,39 @@ else
 	AC_MSG_ERROR([wxWidgets 2.8.0 or newer is required])
 fi
-PKG_CHECK_MODULES([XML2], [libxml-2.0])
+# Check for libxml2
-PKG_CHECK_MODULES([XSLT], [libxslt])
+libxmlversion=0
 AC_DEFUN([LIBXML2TEST],
 [
 	AC_REQUIRE([AC_PROG_AWK])
 	AC_MSG_CHECKING([libxml2])
 	if libxmlversion=`$LIBXMLCONFIG --version`; then
 		AC_MSG_RESULT([$libxmlversion])
 	else
 		AC_MSG_RESULT([not found])
 		AC_MSG_ERROR([libxml2.])
 	fi])
 # Call XML2 TEST func
 LIBXML2TEST
 # Check for libxslt
 libxsltversion=0
 AC_DEFUN([LIBXSLTTEST],
 [
 	AC_REQUIRE([AC_PROG_AWK])
 	AC_MSG_CHECKING([libxslt])
 	if libxsltversion=`$LIBXSLTCONFIG --version`; then
 		AC_MSG_RESULT([$libxsltversion])
 	else
 		AC_MSG_RESULT([not found])
 		AC_MSG_ERROR([libxslt])
 	fi])
 # Call XSLT TEST func
 LIBXSLTTEST
 AC_ARG_ENABLE(debug,
 [  --enable-debug,  Enable debug build],
@ -72,7 +103,8 @@ AC_ARG_ENABLE(debug,
 ])
 # Check pcre is available
-PKG_CHECK_MODULES([PCRE2], [libpcre2-8])
+AC_CHECK_HEADER(pcre.h, ,
 	AC_MSG_ERROR([PCRE headers not found]))
 # Check boost::shared_ptr is available
 AC_LANG(C++)
@ -104,45 +136,23 @@ AC_LANG(C++)
 AC_CHECK_HEADER(expat.h, ,
 	AC_MSG_ERROR([Expat headers not found]))
-# Check enchant-2
+# Check enchant is available
-PKG_CHECK_MODULES(ENCHANT, [enchant-2],
+PKG_CHECK_MODULES(ENCHANT, [enchant], [CXXFLAGS="$CXXFLAGS -DUSE_ENCHANT"], 
-	[AC_DEFINE([USE_ENCHANT]),
+	# otherwise Check ASPELL is available
-		AC_DEFINE([HAVE_LIBENCHANT_2])
+	  [AC_CHECK_HEADER(aspell.h, [ASPELL_LIBS="-laspell"],
-	],
+		AC_MSG_ERROR([Aspell headers not found]))]
 	# Check enchant
 	PKG_CHECK_MODULES(ENCHANT, [enchant],
 		[AC_DEFINE([USE_ENCHANT])],
 		# otherwise Check ASPELL is available
 		[AC_CHECK_HEADER(aspell.h, [ASPELL_LIBS="-laspell"],
 			AC_MSG_ERROR([Aspell headers not found]))]
 	)
 )
 AC_SUBST(ASPELL_LIBS)
-AC_MSG_CHECKING([the GTK version to use])
+# Check gtk
-AC_ARG_WITH([gtk],
+# This has to match the one wxWidgets linked with
-	[AS_HELP_STRING([--with-gtk=2.0|3.0],
+# It is needed to make single-instance-check work
-		[the GTK version to compile against [default: 3.0].
+PKG_CHECK_MODULES(GTK, [gtk+-2.0], [AC_MSG_RESULT([gtk+-2.0])]
-		It has to match the one that wxWidgets linked with.
+	, [PKG_CHECK_MODULES(GTK, [gtk+-3.0], [AC_MSG_RESULT([gtk+-3.0])]
-		GTK is needed to make single-instance-check work.
+		, [CXXFLAGS="$CXXFLAGS -D__NO_GTK__"]
-		]
+	)]
 	)],
 	[AS_CASE(["$with_gtk"],
 		[2.0|3.0], [],
 		[AC_MSG_ERROR([invalid GTK version specified])]
 	)],
 	[with_gtk=3.0]
 )
 AC_MSG_RESULT([$with_gtk])
 AS_CASE(["$with_gtk"],
 	[2.0], [PKG_CHECK_MODULES(GTK, [gtk+-2.0],
 		[], [CXXFLAGS="$CXXFLAGS -D__NO_GTK__"])],
 	[3.0], [PKG_CHECK_MODULES(GTK, [gtk+-3.0],
 		[], [CXXFLAGS="$CXXFLAGS -D__NO_GTK__"])],
 	[]
 )
 #AC_SUBST(GTK2_CFLAGS)
 #AC_SUBST(GTK2_LIBS)
@ -151,8 +161,7 @@ CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS"
 AC_SUBST(WX_LIBS)
-AC_CONFIG_FILES([Makefile data/Makefile m4/Makefile po/Makefile.in src/Makefile])
+AC_OUTPUT(Makefile data/Makefile m4/Makefile po/Makefile.in src/Makefile)
 AC_OUTPUT
 dnl Summarized output
 echo
--- a/data/Makefile.am
+++ b/data/Makefile.am
@ -5,7 +5,7 @@ desktop_in_files = xmlcopyeditor.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
-appdatadir = $(datadir)/metainfo
+appdatadir = $(datadir)/appdata
 appdata_in_files = xmlcopyeditor.appdata.xml.in
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
@INTLTOOL_XML_RULE@
--- a/data/Makefile.in
+++ b/data/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -90,11 +90,10 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = data
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@ -170,9 +169,8 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CSCOPE = @CSCOPE@
 CTAGS = @CTAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
@ -190,7 +188,6 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 ENCHANT_CFLAGS = @ENCHANT_CFLAGS@
 ENCHANT_LIBS = @ENCHANT_LIBS@
 ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@ -239,8 +236,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCRE2_CFLAGS = @PCRE2_CFLAGS@
 PCRE2_LIBS = @PCRE2_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@ -253,10 +248,6 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WX_LIBS = @WX_LIBS@
 XGETTEXT = @XGETTEXT@
 XML2_CFLAGS = @XML2_CFLAGS@
 XML2_LIBS = @XML2_LIBS@
 XSLT_CFLAGS = @XSLT_CFLAGS@
 XSLT_LIBS = @XSLT_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@ -317,7 +308,7 @@ NULL =
 desktopdir = $(datadir)/applications
 desktop_in_files = xmlcopyeditor.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-appdatadir = $(datadir)/metainfo
+appdatadir = $(datadir)/appdata
 appdata_in_files = xmlcopyeditor.appdata.xml.in
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 man_MANS = xmlcopyeditor.1
@ -350,8 +341,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@ -459,10 +450,8 @@ ctags CTAGS:
 cscope cscopelist:
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
--- a/data/xmlcopyeditor.appdata.xml.in
+++ b/data/xmlcopyeditor.appdata.xml.in
@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
+<application>
-  <id>xmlcopyeditor.desktop</id>
+  <id type="desktop">xmlcopyeditor.desktop</id>
-  <project_licence>GPL-2.0+</project_licence>
+  <licence>CC0</licence>
  <name>XML Copy Editor</name>
  <summary>fast, free, validating XML editor</summary>
  <description>
    <_p>
      fast, free, validating XML editor
    </_p>
    <_p>
      XML Copy Editor is an XML editor focusing on editing document markup
      languages like DITA, DocBook, WordprocessingML. Features: DTD/XML
@ -15,10 +15,9 @@
      Spelling and style check with built-in spell/style checker.
    </_p>
  </description>
  <screenshots>
    <_screenshot type="default" width="640" height="387">https://a.fsdn.com/con/app/proj/xml-copy-editor/screenshots/151221.jpg</_screenshot>
  </screenshots>
  <url type="homepage">http://xml-copy-editor.sourceforge.net/</url>
  <updatecontact>zaneuji_at_users.sf.net</updatecontact>
-</component>
+</application>
--- a/debian/changelog
+++ b/debian/changelog
@ -1,32 +1,3 @@
 xmlcopyeditor (1.3.1.0-1) unstable; urgency=low
  * Fix a layout assertion
  * Keep running when spell checking fails
  + Support libenchant-2
  * gdk_x11_get_server_time crashes when an invalid window is passed
  * Migrate to PCRE2 (Miriam Ruiz)
 -- Zane U. Ji <zaneuji@users.sf.net>  Fri, 8 Oct 2022 23:18:06 +0800
 xmlcopyeditor (1.3.0.0-1) unstable; urgency=low
  * Link against wxWidgets 3.0
  * SSE2 compatible CPUs are required (xerces-c++)
  * Use the same default encoding to read and write files (Bug #234)
  * Only show SSE2 warning in debug build
  * Bug #228 Misleading translation when file was changed externally, may lead
    to data loss
  * Bug #227 Dead Link: Help > Forum
  * Bug #221 Patch for building with C++11 (Roger Leigh)
  + Added Mac port
  * Update the iconized frame window when opening files from the command line
  * Fix supporting for filenames with non-ASCII characters
  + Feature #171 Fold element does not fold following whitespace
  + Feature #170 I did a small patch that allows SPACE to trigger
    autocompletion on any space (Thanassis Tsiodras)
 -- Zane U. Ji <zaneuji@users.sf.net>  Tue, 18 Aug 2020 22:15:48 +0800
 xmlcopyeditor (1.2.1.3-1) unstable; urgency=low
  * Fixed problems with new documents
@ -34,8 +5,7 @@ xmlcopyeditor (1.2.1.3-1) unstable; urgency=low
  * Bug #211 Tag-completion remains on-top when XML-Copy-Editor looses focus
  * Keep the original format when associating a DTD/schema/XSL
  + Added a manual
-  - Stopped installing copyright notices of components that are not installed
+  - Stopped installing copyright notices of components that are not installed by us
    by us
  + Feature #169 Close current tab with Ctrl+W
 -- Zane U. Ji <zaneuji@users.sf.net>  Sat, 06 Sep 2014 09:47:43 +0800
--- a/debian/compat
+++ b/debian/compat
@ -1 +1 @@
-9
+8
--- a/debian/control
+++ b/debian/control
@ -1,24 +1,21 @@
 Source: xmlcopyeditor
 Section: editors
-Priority: optional
+Priority: extra
 Maintainer: Zane U. Ji <zaneuji@users.sf.net>
-Build-Depends: debhelper (>= 8.0.0), autotools-dev, cpio, file, gettext,
+Build-Depends: debhelper (>= 8.0.0), autotools-dev, x11proto-composite-dev,
-  intltool, libatk-bridge2.0-dev, libatk1.0-dev, libatspi2.0-dev, libblkid-dev,
+  x11proto-randr-dev, libxfixes-dev, libxerces-c-dev, libglib2.0-0,
-  libboost1.74-dev, libbrotli-dev, libc6-i386, libcairo2-dev, libdatrie-dev,
+  libxdmcp-dev, mime-support, gettext, file, libxinerama-dev, intltool,
-  libdbus-1-dev, libegl-dev, libenchant-2-dev, libepoxy-dev, libexpat1-dev,
+  libcairo2-dev, libxcb1-dev, libxcb-render0-dev, libxi-dev, libgtk2.0-dev,
-  libfakeroot, libffi-dev, libfontconfig-dev, libfreetype-dev, libfribidi-dev,
+  mawk, libgdk-pixbuf2.0-dev, libglib2.0-dev, libatk1.0-dev,
-  libgdk-pixbuf-2.0-dev, libgl-dev, libglib2.0-0, libglib2.0-dev,
+  libxml-parser-perl, libcroco3, libx11-dev, perl-modules, libpopt0, libxml2,
-  libgraphite2-dev, libgtk-3-dev, libharfbuzz-dev, libicu70,
+  pkg-config, libpcre3-dev, libwxgtk2.8-dev, libfreetype6-dev, x11proto-kb-dev,
-  libjpeg-turbo8-dev, libmagic-mgc, libmagic1, libmount-dev, libpango1.0-dev,
+  x11proto-damage-dev, libfontconfig1-dev, x11proto-xinerama-dev,
-  libpcre2-dev, libpcre3-dev, libperl5.34, libpixman-1-dev, libpng-dev,
+  libexpat1-dev, libxml2-dev, libpthread-stubs0-dev, libxext-dev,
-  libselinux1-dev, libsepol-dev, libthai-dev, libtiff-dev, libunistring2,
+  libxrandr-dev, libxau-dev, libenchant-dev, libpixman-1-dev,
-  libwayland-dev, libwxgtk3.0-gtk3-dev, libx11-dev, libxau-dev,
+  libxcomposite-dev, libxrender-dev, libboost1.48-dev, libpng12-dev,
-  libxcb-render0-dev, libxcb-shm0-dev, libxcb1-dev, libxcomposite-dev,
+  libunistring0, libegl1-mesa-lts-saucy, libmagic1, x11proto-render-dev,
-  libxcursor-dev, libxdamage-dev, libxdmcp-dev, libxerces-c-dev, libxext-dev,
+  libexpat1, libxcb-shm0-dev, libpcre3, libpango1.0-dev,
-  libxfixes-dev, libxft-dev, libxi-dev, libxinerama-dev, libxkbcommon-dev,
+  libgl1-mesa-glx-lts-saucy, libxcursor-dev, libxdamage-dev, libxslt1-dev, cpio
  libxml-parser-perl, libxml2, libxml2-dev, libxrandr-dev, libxrender-dev,
  libxslt1-dev, libxtst-dev, mailcap, mawk, perl-modules, pkg-config,
  shared-mime-info, uuid-dev, x11proto-dev, zlib1g-dev
 Standards-Version: 3.9.2
 Homepage: http://xml-copy-editor.sourceforge.net/
 Vcs-Git: git://git.code.sf.net/p/xml-copy-editor/code
--- a/634
+++ b/634
@ -1,9 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
-scriptversion=2018-03-07.03; # UTC
+scriptversion=2005-07-09.11
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 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
@ -16,7 +16,9 @@ scriptversion=2018-03-07.03; # UTC
 # 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, see <https://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@ -27,9 +29,9 @@ scriptversion=2018-03-07.03; # UTC
 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;
+     exit 1;
-    ;;
+     ;;
  -h | --h*)
    cat <<\EOF
 Usage: depcomp [--help] [--version] PROGRAM [ARGS]
@ -39,11 +41,11 @@ as side-effects.
 Environment variables:
  depmode     Dependency tracking mode.
-  source      Source file read by 'PROGRAMS ARGS'.
+  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output 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.
+  tmpdepfile  Temporary file to use when outputing dependencies.
  libtool     Whether libtool is used (yes/no).
 Report bugs to <bug-automake@gnu.org>.
@ -56,66 +58,6 @@ EOF
    ;;
 esac
 # Get the directory component of the given path, and save it in the
 # global variables '$dir'.  Note that this directory component will
 # be either empty or ending with a '/' character.  This is deliberate.
 set_dir_from ()
 {
  case $1 in
    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
      *) dir=;;
  esac
 }
 # Get the suffix-stripped basename of the given path, and save it the
 # global variable '$base'.
 set_base_from ()
 {
  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
 }
 # If no dependency file was actually created by the compiler invocation,
 # we still have to create a dummy depfile, to avoid errors with the
 # Makefile "include basename.Plo" scheme.
 make_dummy_depfile ()
 {
  echo "#dummy" > "$depfile"
 }
 # Factor out some common post-processing of the generated depfile.
 # Requires the auxiliary global variable '$tmpdepfile' to be set.
 aix_post_process_depfile ()
 {
  # If the compiler actually managed to produce a dependency file,
  # post-process it.
  if test -f "$tmpdepfile"; then
    # Each line is of the form 'foo.o: dependency.h'.
    # Do two passes, one to just change these to
    #   $object: dependency.h
    # and one to simply output
    #   dependency.h:
    # which is needed to avoid the deleted-header problem.
    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
    } > "$depfile"
    rm -f "$tmpdepfile"
  else
    make_dummy_depfile
  fi
 }
 # A tabulation character.
 tab='	'
 # A newline character.
 nl='
 '
 # Character ranges might be problematic outside the C locale.
 # These definitions help.
 upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
 lower=abcdefghijklmnopqrstuvwxyz
 digits=0123456789
 alpha=${upper}${lower}
 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
@ -128,9 +70,6 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
 rm -f "$tmpdepfile"
 # Avoid interferences from the environment.
 gccflag= dashmflag=
 # Some modes work just like other modes, but use different flags.  We
 # parameterize here, but still list the modes in the big case below,
 # to make depend.m4 easier to write.  Note that we *cannot* use a case
@ -142,32 +81,9 @@ if test "$depmode" = hp; then
 fi
 if test "$depmode" = dashXmstdout; then
-  # This is just like dashmstdout with a different argument.
+   # This is just like dashmstdout with a different argument.
-  dashmflag=-xM
+   dashmflag=-xM
-  depmode=dashmstdout
+   depmode=dashmstdout
 fi
 cygpath_u="cygpath -u -f -"
 if test "$depmode" = msvcmsys; then
  # This is just like msvisualcpp but w/o cygpath translation.
  # Just convert the backslash-escaped backslashes to single forward
  # slashes to satisfy depend.m4
  cygpath_u='sed s,\\\\,/,g'
  depmode=msvisualcpp
 fi
 if test "$depmode" = msvc7msys; then
  # This is just like msvc7 but w/o cygpath translation.
  # Just convert the backslash-escaped backslashes to single forward
  # slashes to satisfy depend.m4
  cygpath_u='sed s,\\\\,/,g'
  depmode=msvc7
 fi
 if test "$depmode" = xlc; then
  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
  gccflag=-qmakedep=gcc,-MF
  depmode=gcc
 fi
 case "$depmode" in
@ -175,22 +91,10 @@ gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
 ## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
 ## it if -MD -MP comes after the -MF stuff.  Hmm.
-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
 ## the command line argument order; so add the flags where they
 ## appear in depend2.am.  Note that the slowdown incurred here
 ## affects only configure: in makefiles, %FASTDEP% shortcuts this.
  for arg
  do
    case $arg in
    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
    *)  set fnord "$@" "$arg" ;;
    esac
    shift # fnord
    shift # $arg
  done
  "$@"
  stat=$?
-  if test $stat -ne 0; then
+  if test $stat -eq 0; then :
  else
    rm -f "$tmpdepfile"
    exit $stat
  fi
@ -198,17 +102,13 @@ gcc3)
  ;;
 gcc)
 ## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
 ## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
 ## (see the conditional assignment to $gccflag above).
 ## There are various ways to get dependency output from gcc.  Here's
 ## why we pick this rather obscure method:
 ## - Don't want to use -MD because we'd like the dependencies to end
 ##   up in a subdir.  Having to rename by hand is ugly.
 ##   (We might end up doing this anyway to support other compilers.)
 ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   -MM, not -M (despite what the docs say).
 ##   supported by the other compilers which use the 'gcc' depmode.
 ## - Using -M directly means running the compiler twice (even worse
 ##   than renaming).
  if test -z "$gccflag"; then
@ -216,31 +116,31 @@ gcc)
  fi
  "$@" -Wp,"$gccflag$tmpdepfile"
  stat=$?
-  if test $stat -ne 0; then
+  if test $stat -eq 0; then :
  else
    rm -f "$tmpdepfile"
    exit $stat
  fi
  rm -f "$depfile"
  echo "$object : \\" > "$depfile"
-  # The second -e expression handles DOS-style file names with drive
+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-  # letters.
+## 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.
-## Some versions of gcc put a space before the ':'.  On the theory
+  tr ' ' '
 ' < "$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
+## well.
 ## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-  tr ' ' "$nl" < "$tmpdepfile" \
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
    | sed -e 's/$/ :/' >> "$depfile"
  rm -f "$tmpdepfile"
  ;;
@ -258,7 +158,8 @@ sgi)
    "$@" -MDupdate "$tmpdepfile"
  fi
  stat=$?
-  if test $stat -ne 0; then
+  if test $stat -eq 0; then :
  else
    rm -f "$tmpdepfile"
    exit $stat
  fi
@ -266,156 +167,99 @@ sgi)
  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
    echo "$object : \\" > "$depfile"
    # Clip off the initial element (the dependent).  Don't try to be
    # 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 ' ' "$nl" < "$tmpdepfile" \
+    tr ' ' '
-      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+' < "$tmpdepfile" \
-      | tr "$nl" ' ' >> "$depfile"
+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    echo >> "$depfile"
+    tr '
 ' ' ' >> $depfile
    echo >> $depfile
    # The second pass generates a dummy entry for each header file.
-    tr ' ' "$nl" < "$tmpdepfile" \
+    tr ' ' '
-      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+' < "$tmpdepfile" \
-      >> "$depfile"
+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
   >> $depfile
  else
-    make_dummy_depfile
+    # The sourcefile does not contain any dependencies, so just
    # store a dummy comment line, to avoid errors with the Makefile
    # "include basename.Plo" scheme.
    echo "#dummy" > "$depfile"
  fi
  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.
-  set_dir_from "$object"
+  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  set_base_from "$object"
+  tmpdepfile="$stripped.u"
  if test "$libtool" = yes; then
    tmpdepfile1=$dir$base.u
    tmpdepfile2=$base.u
    tmpdepfile3=$dir.libs/$base.u
    "$@" -Wc,-M
  else
    tmpdepfile1=$dir$base.u
    tmpdepfile2=$dir$base.u
    tmpdepfile3=$dir$base.u
    "$@" -M
  fi
  stat=$?
-  if test $stat -ne 0; then
+
-    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  if test -f "$tmpdepfile"; then :
-    exit $stat
+  else
    stripped=`echo "$stripped" | sed 's,^.*/,,'`
    tmpdepfile="$stripped.u"
  fi
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  if test $stat -eq 0; then :
-  do
+  else
    test -f "$tmpdepfile" && break
  done
  aix_post_process_depfile
  ;;
 tcc)
  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
  # FIXME: That version still under development at the moment of writing.
  #        Make that this statement remains true also for stable, released
  #        versions.
  # It will wrap lines (doesn't matter whether long or short) with a
  # trailing '\', as in:
  #
  #   foo.o : \
  #    foo.c \
  #    foo.h \
  #
  # It will put a trailing '\' even on the last line, and will use leading
  # spaces rather than leading tabs (at least since its commit 0394caf7
  # "Emit spaces for -MD").
  "$@" -MD -MF "$tmpdepfile"
  stat=$?
  if test $stat -ne 0; then
    rm -f "$tmpdepfile"
    exit $stat
  fi
-  rm -f "$depfile"
+
-  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+  if test -f "$tmpdepfile"; then
-  # We have to change lines of the first kind to '$object: \'.
+    outname="$stripped.o"
-  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+    # Each line is of the form `foo.o: dependent.h'.
-  # And for each line of the second kind, we have to emit a 'dep.h:'
+    # Do two passes, one to just change these to
-  # dummy dependency, to avoid the deleted-header problem.
+    # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
+    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
  else
    # The sourcefile does not contain any dependencies, so just
    # store a dummy comment line, to avoid errors with the Makefile
    # "include basename.Plo" scheme.
    echo "#dummy" > "$depfile"
  fi
  rm -f "$tmpdepfile"
  ;;
-## The order of this option in the case statement is important, since the
+icc)
-## shell code in configure will try each of these formats in the order
+  # Intel's C compiler understands `-MD -MF file'.  However on
-## listed in this file.  A plain '-MD' option would be understood by many
+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-## compilers, so we must ensure this comes after the gcc and icc options.
+  # ICC 7.0 will fill foo.d with something like
-pgcc)
+  #    foo.o: sub/foo.c
-  # Portland's C compiler understands '-MD'.
+  #    foo.o: sub/foo.h
-  # Will always output deps to 'file.d' where file is the root name of the
+  # which is wrong.  We want:
-  # source file under compilation, even if file resides in a subdirectory.
+  #    sub/foo.o: sub/foo.c
-  # The object file name does not affect the name of the '.d' file.
+  #    sub/foo.o: sub/foo.h
-  # pgcc 10.2 will output
+  #    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 ... \
  #     ...
  set_dir_from "$object"
  # Use the source, not the object, to determine the base name, since
  # that's sadly what pgcc will do too.
  set_base_from "$source"
  tmpdepfile=$base.d
-  # For projects that build the same source file twice into different object
+  "$@" -MD -MF "$tmpdepfile"
-  # files, the pgcc approach of using the *source* file root name can cause
+  stat=$?
-  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+  if test $stat -eq 0; then :
-  # the same $tmpdepfile.
+  else
  lockdir=$base.d-lock
  trap "
    echo '$0: caught signal, cleaning up...' >&2
    rmdir '$lockdir'
    exit 1
  " 1 2 13 15
  numtries=100
  i=$numtries
  while test $i -gt 0; do
    # mkdir is a portable test-and-set.
    if mkdir "$lockdir" 2>/dev/null; then
      # This process acquired the lock.
      "$@" -MD
      stat=$?
      # Release the lock.
      rmdir "$lockdir"
      break
    else
      # If the lock is being held by a different process, wait
      # until the winning process is done or we timeout.
      while test -d "$lockdir" && test $i -gt 0; do
        sleep 1
        i=`expr $i - 1`
      done
    fi
    i=`expr $i - 1`
  done
  trap - 1 2 13 15
  if test $i -le 0; then
    echo "$0: failed to acquire lock after $numtries attempts" >&2
    echo "$0: check lockdir '$lockdir'" >&2
    exit 1
  fi
  if test $stat -ne 0; then
    rm -f "$tmpdepfile"
    exit $stat
  fi
@ -427,141 +271,68 @@ pgcc)
  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 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    | sed -e 's/$/ :/' >> "$depfile"
+    sed -e 's/$/ :/' >> "$depfile"
  rm -f "$tmpdepfile"
  ;;
 hp2)
  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
  # compilers, which have integrated preprocessors.  The correct option
  # to use with these is +Maked; it writes dependencies to a file named
  # 'foo.d', which lands next to the object file, wherever that
  # happens to be.
  # Much of this is similar to the tru64 case; see comments there.
  set_dir_from  "$object"
  set_base_from "$object"
  if test "$libtool" = yes; then
    tmpdepfile1=$dir$base.d
    tmpdepfile2=$dir.libs/$base.d
    "$@" -Wc,+Maked
  else
    tmpdepfile1=$dir$base.d
    tmpdepfile2=$dir$base.d
    "$@" +Maked
  fi
  stat=$?
  if test $stat -ne 0; then
     rm -f "$tmpdepfile1" "$tmpdepfile2"
     exit $stat
  fi
  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
  do
    test -f "$tmpdepfile" && break
  done
  if test -f "$tmpdepfile"; then
    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
    # Add 'dependent.h:' lines.
    sed -ne '2,${
               s/^ *//
               s/ \\*$//
               s/$/:/
               p
             }' "$tmpdepfile" >> "$depfile"
  else
    make_dummy_depfile
  fi
  rm -f "$tmpdepfile" "$tmpdepfile2"
  ;;
 tru64)
-  # The Tru64 compiler uses -MD to generate dependencies as a side
+   # 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
+   # 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.
+   # Subdirectories are respected.
-  set_dir_from  "$object"
+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  set_base_from "$object"
+   test "x$dir" = "x$object" && dir=
   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-  if test "$libtool" = yes; then
+   if test "$libtool" = yes; then
-    # Libtool generates 2 separate objects for the 2 libraries.  These
+      # With Tru64 cc, shared objects can also be used to make a
-    # two compilations output dependencies in $dir.libs/$base.o.d and
+      # static library.  This mecanism is used in libtool 1.4 series to
-    # in $dir$base.o.d.  We have to check for both files, because
+      # handle both shared and static libraries in a single compilation.
-    # one of the two compilations can be disabled.  We should prefer
+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+      #
-    # automatically cleaned when .libs/ is deleted, while ignoring
+      # With libtool 1.5 this exception was removed, and libtool now
-    # the former would cause a distcleancheck panic.
+      # generates 2 separate objects for the 2 libraries.  These two
-    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+      # compilations output dependencies in in $dir.libs/$base.o.d and
-    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+      # in $dir$base.o.d.  We have to check for both files, because
-    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+      # one of the two compilations can be disabled.  We should prefer
-    "$@" -Wc,-MD
+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-  else
+      # automatically cleaned when .libs/ is deleted, while ignoring
-    tmpdepfile1=$dir$base.d
+      # the former would cause a distcleancheck panic.
-    tmpdepfile2=$dir$base.d
+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-    tmpdepfile3=$dir$base.d
+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-    "$@" -MD
+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-  fi
+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
      "$@" -Wc,-MD
   else
      tmpdepfile1=$dir$base.o.d
      tmpdepfile2=$dir$base.d
      tmpdepfile3=$dir$base.d
      tmpdepfile4=$dir$base.d
      "$@" -MD
   fi
-  stat=$?
+   stat=$?
-  if test $stat -ne 0; then
+   if test $stat -eq 0; then :
-    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+   else
-    exit $stat
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-  fi
+      exit $stat
   fi
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-  do
+   do
-    test -f "$tmpdepfile" && break
+     test -f "$tmpdepfile" && break
-  done
+   done
-  # Same post-processing that is required for AIX mode.
+   if test -f "$tmpdepfile"; then
-  aix_post_process_depfile
+      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"
-msvc7)
+   else
-  if test "$libtool" = yes; then
+      echo "#dummy" > "$depfile"
-    showIncludes=-Wc,-showIncludes
+   fi
-  else
+   rm -f "$tmpdepfile"
-    showIncludes=-showIncludes
+   ;;
  fi
  "$@" $showIncludes > "$tmpdepfile"
  stat=$?
  grep -v '^Note: including file: ' "$tmpdepfile"
  if test $stat -ne 0; then
    rm -f "$tmpdepfile"
    exit $stat
  fi
  rm -f "$depfile"
  echo "$object : \\" > "$depfile"
  # The first sed program below extracts the file names and escapes
  # backslashes for cygpath.  The second sed program outputs the file
  # name when reading, but also accumulates all include files in the
  # hold buffer in order to output them again at the end.  This only
  # works with sed implementations that can handle large buffers.
  sed < "$tmpdepfile" -n '
 /^Note: including file:  *\(.*\)/ {
  s//\1/
  s/\\/\\\\/g
  p
 }' | $cygpath_u | sort -u | sed -n '
 s/ /\\ /g
 s/\(.*\)/'"$tab"'\1 \\/p
 s/.\(.*\) \\/\1:/
 H
 $ {
  s/.*/'"$tab"'/
  G
  p
 }' >> "$depfile"
  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
  rm -f "$tmpdepfile"
  ;;
 msvc7msys)
  # 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
  ;;
 #nosideeffect)
  # This comment above is used by automake to tell side-effect
@ -574,13 +345,13 @@ dashmstdout)
  # Remove the call to Libtool.
  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
+    while test $1 != '--mode=compile'; do
      shift
    done
    shift
  fi
-  # Remove '-o $object'.
+  # Remove `-o $object'.
  IFS=" "
  for arg
  do
@ -600,18 +371,18 @@ dashmstdout)
  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|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
  rm -f "$depfile"
  cat < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  tr ' ' '
-  # correctly.  Breaking it into two sed invocations is a workaround.
+' < "$tmpdepfile" | \
-  tr ' ' "$nl" < "$tmpdepfile" \
+## Some versions of the HPUX 10.20 sed can't process this invocation
-    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+## correctly.  Breaking it into two sed invocations is a workaround.
-    | sed -e 's/$/ :/' >> "$depfile"
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
  rm -f "$tmpdepfile"
  ;;
@ -625,51 +396,41 @@ makedepend)
  "$@" || exit $?
  # Remove any Libtool call
  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
+    while test $1 != '--mode=compile'; do
      shift
    done
    shift
  fi
  # X makedepend
  shift
-  cleared=no eat=no
+  cleared=no
-  for arg
+  for arg in "$@"; do
  do
    case $cleared in
    no)
      set ""; shift
      cleared=yes ;;
    esac
    if test $eat = yes; then
      eat=no
      continue
    fi
    case "$arg" in
    -D*|-I*)
      set fnord "$@" "$arg"; shift ;;
    # Strip any option that makedepend may not understand.  Remove
    # the object too, otherwise makedepend will parse it as a source file.
    -arch)
      eat=yes ;;
    -*|$object)
      ;;
    *)
      set fnord "$@" "$arg"; shift ;;
    esac
  done
-  obj_suffix=`echo "$object" | sed 's/^.*\././'`
+  obj_suffix="`echo $object | sed 's/^.*\././'`"
  touch "$tmpdepfile"
  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
  rm -f "$depfile"
-  # makedepend may prepend the VPATH from the source file name to the object.
+  cat < "$tmpdepfile" > "$depfile"
-  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed '1,2d' "$tmpdepfile" | tr ' ' '
-  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
+' | \
-  # Some versions of the HPUX 10.20 sed can't process the last invocation
+## Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
+## correctly.  Breaking it into two sed invocations is a workaround.
-  sed '1,2d' "$tmpdepfile" \
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
    | tr ' ' "$nl" \
    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
    | sed -e 's/$/ :/' >> "$depfile"
  rm -f "$tmpdepfile" "$tmpdepfile".bak
  ;;
@ -680,13 +441,13 @@ cpp)
  # Remove the call to Libtool.
  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
+    while test $1 != '--mode=compile'; do
      shift
    done
    shift
  fi
-  # Remove '-o $object'.
+  # Remove `-o $object'.
  IFS=" "
  for arg
  do
@ -705,10 +466,10 @@ cpp)
    esac
  done
-  "$@" -E \
+  "$@" -E |
-    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    | sed '$ s: \\$::' > "$tmpdepfile"
+    sed '$ s: \\$::' > "$tmpdepfile"
  rm -f "$depfile"
  echo "$object : \\" > "$depfile"
  cat < "$tmpdepfile" >> "$depfile"
@ -718,56 +479,35 @@ cpp)
 msvisualcpp)
  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
+  # always write the preprocessed file to stdout, regardless of -o,
  # because we must use -o when running libtool.
  "$@" || exit $?
  # Remove the call to Libtool.
  if test "$libtool" = yes; then
    while test "X$1" != 'X--mode=compile'; do
      shift
    done
    shift
  fi
  IFS=" "
  for arg
  do
    case "$arg" in
    -o)
      shift
      ;;
    $object)
      shift
      ;;
    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-        set fnord "$@"
+	set fnord "$@"
-        shift
+	shift
-        shift
+	shift
-        ;;
+	;;
    *)
-        set fnord "$@" "$arg"
+	set fnord "$@" "$arg"
-        shift
+	shift
-        shift
+	shift
-        ;;
+	;;
    esac
  done
-  "$@" -E 2>/dev/null |
+  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
  rm -f "$depfile"
  echo "$object : \\" > "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "$tab" >> "$depfile"
+  echo "	" >> "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
  rm -f "$tmpdepfile"
  ;;
 msvcmsys)
  # 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
  ;;
 none)
  exec "$@"
  ;;
@ -783,9 +523,9 @@ exit 0
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "$"
 # time-stamp-end: "; # UTC"
 # End:
--- a/435
+++ b/435
@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
-scriptversion=2020-11-14.01; # UTC
+scriptversion=2009-04-28.21; # UTC
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@ -35,21 +35,25 @@ scriptversion=2020-11-14.01; # UTC
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# 'make' implicit rules from creating a file called install from it
+# `make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
 # from scratch.
 tab='	'
 nl='
 '
-IFS=" $tab$nl"
+IFS=" ""	$nl"
-# Set DOITPROG to "echo" to test this script.
+# set DOITPROG to echo to test this script
 # Don't use :- since 4.3BSD and earlier shells don't like it.
 doit=${DOITPROG-}
-doit_exec=${doit:-exec}
+if test -z "$doit"; then
  doit_exec=exec
 else
  doit_exec=$doit
 fi
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
@ -64,16 +68,22 @@ mvprog=${MVPROG-mv}
 rmprog=${RMPROG-rm}
 stripprog=${STRIPPROG-strip}
 posix_glob='?'
 initialize_posix_glob='
  test "$posix_glob" != "?" || {
    if (set -f) 2>/dev/null; then
      posix_glob=
    else
      posix_glob=:
    fi
  }
 '
 posix_mkdir=
 # Desired mode of installed file.
 mode=0755
 # Create dirs (including intermediate dirs) using mode 755.
 # This is like GNU 'install' as of coreutils 8.32 (2020).
 mkdir_umask=22
 backupsuffix=
 chgrpcmd=
 chmodcmd=$chmodprog
 chowncmd=
@ -87,7 +97,7 @@ dir_arg=
 dst_arg=
 copy_on_change=false
-is_target_a_directory=possibly
+no_target_directory=
 usage="\
 Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
@ -104,28 +114,18 @@ Options:
     --version  display version info and exit.
  -c            (ignored)
-  -C            install only if different (preserve data modification time)
+  -C            install only if different (preserve the last data modification time)
  -d            create directories instead of installing files.
  -g GROUP      $chgrpprog installed files to GROUP.
  -m MODE       $chmodprog installed files to MODE.
  -o USER       $chownprog installed files to USER.
  -p            pass -p to $cpprog.
  -s            $stripprog installed files.
  -S SUFFIX     attempt to back up existing files, with suffix SUFFIX.
  -t DIRECTORY  install into DIRECTORY.
  -T            report an error if DSTFILE is a directory.
 Environment variables override the default commands:
  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
  RMPROG STRIPPROG
 By default, rm is invoked with -f; when overridden with RMPROG,
 it's up to you to specify -f if you want it.
 If -S is not specified, no backups are attempted.
 Email bug reports to bug-automake@gnu.org.
 Automake home page: https://www.gnu.org/software/automake/
 "
 while test $# -ne 0; do
@ -137,62 +137,42 @@ while test $# -ne 0; do
    -d) dir_arg=true;;
    -g) chgrpcmd="$chgrpprog $2"
-        shift;;
+	shift;;
    --help) echo "$usage"; exit $?;;
    -m) mode=$2
-        case $mode in
+	case $mode in
-          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+	  *' '* | *'	'* | *'
-            echo "$0: invalid mode: $mode" >&2
+'*	  | *'*'* | *'?'* | *'['*)
-            exit 1;;
+	    echo "$0: invalid mode: $mode" >&2
-        esac
+	    exit 1;;
-        shift;;
+	esac
 	shift;;
    -o) chowncmd="$chownprog $2"
-        shift;;
+	shift;;
    -p) cpprog="$cpprog -p";;
    -s) stripcmd=$stripprog;;
-    -S) backupsuffix="$2"
+    -t) dst_arg=$2
-        shift;;
+	shift;;
-    -t)
+    -T) no_target_directory=true;;
        is_target_a_directory=always
        dst_arg=$2
        # Protect names problematic for 'test' and other utilities.
        case $dst_arg in
          -* | [=\(\)!]) dst_arg=./$dst_arg;;
        esac
        shift;;
    -T) is_target_a_directory=never;;
    --version) echo "$0 $scriptversion"; exit $?;;
-    --) shift
+    --)	shift
-        break;;
+	break;;
-    -*) echo "$0: invalid option: $1" >&2
+    -*)	echo "$0: invalid option: $1" >&2
-        exit 1;;
+	exit 1;;
    *)  break;;
  esac
  shift
 done
 # We allow the use of options -d and -T together, by making -d
 # take the precedence; this is for compatibility with GNU install.
 if test -n "$dir_arg"; then
  if test -n "$dst_arg"; then
    echo "$0: target directory not allowed when installing a directory." >&2
    exit 1
  fi
 fi
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
  # When -d is used, all remaining arguments are directories to create.
  # When -t is used, the destination is already specified.
@ -206,10 +186,6 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
    fi
    shift # arg
    dst_arg=$arg
    # Protect names problematic for 'test' and other utilities.
    case $dst_arg in
      -* | [=\(\)!]) dst_arg=./$dst_arg;;
    esac
  done
 fi
@ -218,26 +194,13 @@ if test $# -eq 0; then
    echo "$0: no input file specified." >&2
    exit 1
  fi
-  # It's OK to call 'install-sh -d' without argument.
+  # It's OK to call `install-sh -d' without argument.
  # This can happen when creating conditional directories.
  exit 0
 fi
 if test -z "$dir_arg"; then
-  if test $# -gt 1 || test "$is_target_a_directory" = always; then
+  trap '(exit $?); exit' 1 2 13 15
    if test ! -d "$dst_arg"; then
      echo "$0: $dst_arg: Is not a directory." >&2
      exit 1
    fi
  fi
 fi
 if test -z "$dir_arg"; then
  do_exit='(exit $ret); exit $ret'
  trap "ret=129; $do_exit" 1
  trap "ret=130; $do_exit" 2
  trap "ret=141; $do_exit" 13
  trap "ret=143; $do_exit" 15
  # Set umask so as not to create temps with too-generous modes.
  # However, 'strip' requires both read and write access to temps.
@ -248,16 +211,16 @@ if test -z "$dir_arg"; then
    *[0-7])
      if test -z "$stripcmd"; then
-        u_plus_rw=
+	u_plus_rw=
      else
-        u_plus_rw='% 200'
+	u_plus_rw='% 200'
      fi
      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
    *)
      if test -z "$stripcmd"; then
-        u_plus_rw=
+	u_plus_rw=
      else
-        u_plus_rw=,u+rw
+	u_plus_rw=,u+rw
      fi
      cp_umask=$mode$u_plus_rw;;
  esac
@ -265,9 +228,9 @@ fi
 for src
 do
-  # Protect names problematic for 'test' and other utilities.
+  # Protect names starting with `-'.
  case $src in
-    -* | [=\(\)!]) src=./$src;;
+    -*) src=./$src;;
  esac
  if test -n "$dir_arg"; then
@ -275,10 +238,6 @@ do
    dstdir=$dst
    test -d "$dstdir"
    dstdir_status=$?
    # Don't chown directories that already exist.
    if test $dstdir_status = 0; then
      chowncmd=""
    fi
  else
    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
@ -293,150 +252,185 @@ do
      echo "$0: no destination specified." >&2
      exit 1
    fi
    dst=$dst_arg
-    # If destination is a directory, append the input filename.
+    dst=$dst_arg
    # Protect names starting with `-'.
    case $dst in
      -*) dst=./$dst;;
    esac
    # If destination is a directory, append the input filename; won't work
    # if double slashes aren't ignored.
    if test -d "$dst"; then
-      if test "$is_target_a_directory" = never; then
+      if test -n "$no_target_directory"; then
-        echo "$0: $dst_arg: Is a directory" >&2
+	echo "$0: $dst_arg: Is a directory" >&2
-        exit 1
+	exit 1
      fi
      dstdir=$dst
-      dstbase=`basename "$src"`
+      dst=$dstdir/`basename "$src"`
      case $dst in
 	*/) dst=$dst$dstbase;;
 	*)  dst=$dst/$dstbase;;
      esac
      dstdir_status=0
    else
-      dstdir=`dirname "$dst"`
+      # Prefer dirname, but fall back on a substitute if dirname fails.
      dstdir=`
 	(dirname "$dst") 2>/dev/null ||
 	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	     X"$dst" : 'X\(//\)[^/]' \| \
 	     X"$dst" : 'X\(//\)$' \| \
 	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
 	echo X"$dst" |
 	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\/\)[^/].*/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\/\)$/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\).*/{
 		   s//\1/
 		   q
 		 }
 		 s/.*/./; q'
      `
      test -d "$dstdir"
      dstdir_status=$?
    fi
  fi
  case $dstdir in
    */) dstdirslash=$dstdir;;
    *)  dstdirslash=$dstdir/;;
  esac
  obsolete_mkdir_used=false
  if test $dstdir_status != 0; then
    case $posix_mkdir in
      '')
-        # With -d, create the new directory with the user-specified mode.
+	# Create intermediate dirs using mode 755 as modified by the umask.
-        # Otherwise, rely on $mkdir_umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
-        if test -n "$dir_arg"; then
+	umask=`umask`
-          mkdir_mode=-m$mode
+	case $stripcmd.$umask in
-        else
+	  # Optimize common cases.
-          mkdir_mode=
+	  *[2367][2367]) mkdir_umask=$umask;;
-        fi
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-        posix_mkdir=false
+	  *[0-7])
-	# The $RANDOM variable is not portable (e.g., dash).  Use it
+	    mkdir_umask=`expr $umask + 22 \
-	# here however when possible just to lower collision chance.
+	      - $umask % 100 % 40 + $umask % 20 \
-	tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	      - $umask % 10 % 4 + $umask % 2
 	    `;;
 	  *) mkdir_umask=$umask,go-w;;
 	esac
-	trap '
+	# With -d, create the new directory with the user-specified mode.
-	  ret=$?
+	# Otherwise, rely on $mkdir_umask.
-	  rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
+	if test -n "$dir_arg"; then
-	  exit $ret
+	  mkdir_mode=-m$mode
 	' 0
 	# Because "mkdir -p" follows existing symlinks and we likely work
 	# directly in world-writeable /tmp, make sure that the '$tmpdir'
 	# directory is successfully created first before we actually test
 	# 'mkdir -p'.
 	if (umask $mkdir_umask &&
 	    $mkdirprog $mkdir_mode "$tmpdir" &&
 	    exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
 	then
 	  if test -z "$dir_arg" || {
 	       # Check for POSIX incompatibilities with -m.
 	       # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
 	       # other-writable bit of parent directory when it shouldn't.
 	       # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 	       test_tmpdir="$tmpdir/a"
 	       ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
 	       case $ls_ld_tmpdir in
 		 d????-?r-*) different_mode=700;;
 		 d????-?--*) different_mode=755;;
 		 *) false;;
 	       esac &&
 	       $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
 		 ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
 		 test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
 	       }
 	     }
 	  then posix_mkdir=:
 	  fi
 	  rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
 	else
-	  # Remove any dirs left behind by ancient mkdir implementations.
+	  mkdir_mode=
 	  rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
 	fi
-	trap '' 0;;
+
 	posix_mkdir=false
 	case $umask in
 	  *[123567][0-7][0-7])
 	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
 	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
 	    ;;
 	  *)
 	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
 	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
 	    if (umask $mkdir_umask &&
 		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
 	    then
 	      if test -z "$dir_arg" || {
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
 		   # other-writeable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in
 		     d????-?r-*) different_mode=700;;
 		     d????-?--*) different_mode=755;;
 		     *) false;;
 		   esac &&
 		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
 		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
 		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
 		   }
 		 }
 	      then posix_mkdir=:
 	      fi
 	      rmdir "$tmpdir/d" "$tmpdir"
 	    else
 	      # Remove any dirs left behind by ancient mkdir implementations.
 	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
 	    fi
 	    trap '' 0;;
 	esac;;
    esac
    if
      $posix_mkdir && (
-        umask $mkdir_umask &&
+	umask $mkdir_umask &&
-        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
      )
    then :
    else
-      # mkdir does not conform to POSIX,
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
      # or it failed possibly due to a race condition.  Create the
      # directory the slow way, step by step, checking for races as we go.
      case $dstdir in
-        /*) prefix='/';;
+	/*) prefix='/';;
-        [-=\(\)!]*) prefix='./';;
+	-*) prefix='./';;
-        *)  prefix='';;
+	*)  prefix='';;
      esac
      eval "$initialize_posix_glob"
      oIFS=$IFS
      IFS=/
-      set -f
+      $posix_glob set -f
      set fnord $dstdir
      shift
-      set +f
+      $posix_glob set +f
      IFS=$oIFS
      prefixes=
      for d
      do
-        test X"$d" = X && continue
+	test -z "$d" && continue
-        prefix=$prefix$d
+	prefix=$prefix$d
-        if test -d "$prefix"; then
+	if test -d "$prefix"; then
-          prefixes=
+	  prefixes=
-        else
+	else
-          if $posix_mkdir; then
+	  if $posix_mkdir; then
-            (umask $mkdir_umask &&
+	    (umask=$mkdir_umask &&
-             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-            # Don't fail if two instances are running concurrently.
+	    # Don't fail if two instances are running concurrently.
-            test -d "$prefix" || exit 1
+	    test -d "$prefix" || exit 1
-          else
+	  else
-            case $prefix in
+	    case $prefix in
-              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-              *) qprefix=$prefix;;
+	      *) qprefix=$prefix;;
-            esac
+	    esac
-            prefixes="$prefixes '$qprefix'"
+	    prefixes="$prefixes '$qprefix'"
-          fi
+	  fi
-        fi
+	fi
-        prefix=$prefix/
+	prefix=$prefix/
      done
      if test -n "$prefixes"; then
-        # Don't fail if two instances are running concurrently.
+	# Don't fail if two instances are running concurrently.
-        (umask $mkdir_umask &&
+	(umask $mkdir_umask &&
-         eval "\$doit_exec \$mkdirprog $prefixes") ||
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-          test -d "$dstdir" || exit 1
+	  test -d "$dstdir" || exit 1
-        obsolete_mkdir_used=true
+	obsolete_mkdir_used=true
      fi
    fi
  fi
@ -449,25 +443,14 @@ do
  else
    # Make a couple of temp file names in the proper directory.
-    dsttmp=${dstdirslash}_inst.$$_
+    dsttmp=$dstdir/_inst.$$_
-    rmtmp=${dstdirslash}_rm.$$_
+    rmtmp=$dstdir/_rm.$$_
    # Trap to clean up those temp files at exit.
    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
    # Copy the file name to the temp name.
-    (umask $cp_umask &&
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
     { test -z "$stripcmd" || {
 	 # Create $dsttmp read-write so that cp doesn't create it read-only,
 	 # which would cause strip to fail.
 	 if test -z "$doit"; then
 	   : >"$dsttmp" # No need to fork-exec 'touch'.
 	 else
 	   $doit touch "$dsttmp"
 	 fi
       }
     } &&
     $doit_exec $cpprog "$src" "$dsttmp") &&
    # and set any options; do chmod last to preserve setuid bits.
    #
@ -482,24 +465,20 @@ do
    # If -C, don't bother to copy if it wouldn't change the file.
    if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-       set -f &&
+
       eval "$initialize_posix_glob" &&
       $posix_glob set -f &&
       set X $old && old=:$2:$4:$5:$6 &&
       set X $new && new=:$2:$4:$5:$6 &&
-       set +f &&
+       $posix_glob set +f &&
       test "$old" = "$new" &&
       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
    then
      rm -f "$dsttmp"
    else
      # If $backupsuffix is set, and the file being installed
      # already exists, attempt a backup.  Don't worry if it fails,
      # e.g., if mv doesn't support -f.
      if test -n "$backupsuffix" && test -f "$dst"; then
        $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null
      fi
      # Rename the file to the real destination.
      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
@ -507,24 +486,24 @@ do
      # to itself, or perhaps because mv is so ancient that it does not
      # support -f.
      {
-        # Now remove or move aside any old file at destination location.
+	# Now remove or move aside any old file at destination location.
-        # We try this two ways since rm can't unlink itself on some
+	# We try this two ways since rm can't unlink itself on some
-        # systems and the destination file might be busy for other
+	# systems and the destination file might be busy for other
-        # reasons.  In this case, the final cleanup might fail but the new
+	# reasons.  In this case, the final cleanup might fail but the new
-        # file should still install successfully.
+	# file should still install successfully.
-        {
+	{
-          test ! -f "$dst" ||
+	  test ! -f "$dst" ||
-          $doit $rmcmd "$dst" 2>/dev/null ||
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-            { $doit $rmcmd "$rmtmp" 2>/dev/null; :; }
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-          } ||
+	  } ||
-          { echo "$0: cannot unlink or rename $dst" >&2
+	  { echo "$0: cannot unlink or rename $dst" >&2
-            (exit 1); exit 1
+	    (exit 1); exit 1
-          }
+	  }
-        } &&
+	} &&
-        # Now rename the file to the real destination.
+	# Now rename the file to the real destination.
-        $doit $mvcmd "$dsttmp" "$dst"
+	$doit $mvcmd "$dsttmp" "$dst"
      }
    fi || exit 1
@ -533,9 +512,9 @@ do
 done
 # Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
+# time-stamp-time-zone: "UTC"
 # time-stamp-end: "; # UTC"
 # End:
--- a/ltmain.sh
+++ b/ltmain.sh
@ -31,7 +31,7 @@
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4.6 Debian-2.4.6-15build2"
+VERSION="2.4.6 Debian-2.4.6-2"
 package_revision=2.4.6
@ -387,7 +387,7 @@ EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
 # putting '$debug_cmd' at the start of all your functions, you can get
 # bash to show function call trace with:
 #
-#    debug_cmd='echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
+#    debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
 debug_cmd=${debug_cmd-":"}
 exit_cmd=:
@ -1370,7 +1370,7 @@ func_lt_ver ()
 #! /bin/sh
 # Set a version string for this script.
-scriptversion=2015-10-07.11; # UTC
+scriptversion=2014-01-07.03; # UTC
 # A portable, pluggable option parser for Bourne shell.
 # Written by Gary V. Vaughan, 2010
@ -1530,8 +1530,6 @@ func_run_hooks ()
 {
    $debug_cmd
    _G_rc_run_hooks=false
    case " $hookable_fns " in
      *" $1 "*) ;;
      *) func_fatal_error "'$1' does not support hook funcions.n" ;;
@ -1540,16 +1538,16 @@ func_run_hooks ()
    eval _G_hook_fns=\$$1_hooks; shift
    for _G_hook in $_G_hook_fns; do
-      if eval $_G_hook '"$@"'; then
+      eval $_G_hook '"$@"'
-        # store returned options list back into positional
+
-        # parameters for next 'cmd' execution.
+      # store returned options list back into positional
-        eval _G_hook_result=\$${_G_hook}_result
+      # parameters for next 'cmd' execution.
-        eval set dummy "$_G_hook_result"; shift
+      eval _G_hook_result=\$${_G_hook}_result
-        _G_rc_run_hooks=:
+      eval set dummy "$_G_hook_result"; shift
      fi
    done
-    $_G_rc_run_hooks && func_run_hooks_result=$_G_hook_result
+    func_quote_for_eval ${1+"$@"}
    func_run_hooks_result=$func_quote_for_eval_result
 }
@ -1559,16 +1557,10 @@ func_run_hooks ()
 ## --------------- ##
 # In order to add your own option parsing hooks, you must accept the
-# full positional parameter list in your hook function, you may remove/edit
+# full positional parameter list in your hook function, remove any
-# any options that you action, and then pass back the remaining unprocessed
+# options that you action, and then pass back the remaining unprocessed
 # options in '<hooked_function_name>_result', escaped suitably for
-# 'eval'.  In this case you also must return $EXIT_SUCCESS to let the
+# 'eval'.  Like this:
 # hook's caller know that it should pay attention to
 # '<hooked_function_name>_result'.  Returning $EXIT_FAILURE signalizes that
 # arguments are left untouched by the hook and therefore caller will ignore the
 # result variable.
 #
 # Like this:
 #
 #    my_options_prep ()
 #    {
@ -1578,11 +1570,9 @@ func_run_hooks ()
 #        usage_message=$usage_message'
 #      -s, --silent       don'\''t print informational messages
 #    '
-#        # No change in '$@' (ignored completely by this hook).  There is
+#
-#        # no need to do the equivalent (but slower) action:
+#        func_quote_for_eval ${1+"$@"}
-#        # func_quote_for_eval ${1+"$@"}
+#        my_options_prep_result=$func_quote_for_eval_result
 #        # my_options_prep_result=$func_quote_for_eval_result
 #        false
 #    }
 #    func_add_hook func_options_prep my_options_prep
 #
@ -1591,37 +1581,25 @@ func_run_hooks ()
 #    {
 #        $debug_cmd
 #
 #        args_changed=false
 #
 #        # Note that for efficiency, we parse as many options as we can
 #        # recognise in a loop before passing the remainder back to the
 #        # caller on the first unrecognised argument we encounter.
 #        while test $# -gt 0; do
 #          opt=$1; shift
 #          case $opt in
-#            --silent|-s) opt_silent=:
+#            --silent|-s) opt_silent=: ;;
 #                         args_changed=:
 #                         ;;
 #            # Separate non-argument short options:
 #            -s*)         func_split_short_opt "$_G_opt"
 #                         set dummy "$func_split_short_opt_name" \
 #                             "-$func_split_short_opt_arg" ${1+"$@"}
 #                         shift
 #                         args_changed=:
 #                         ;;
-#            *)           # Make sure the first unrecognised option "$_G_opt"
+#            *)            set dummy "$_G_opt" "$*"; shift; break ;;
 #                         # is added back to "$@", we could need that later
 #                         # if $args_changed is true.
 #                         set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
 #          esac
 #        done
 #
-#        if $args_changed; then
+#        func_quote_for_eval ${1+"$@"}
-#          func_quote_for_eval ${1+"$@"}
+#        my_silent_option_result=$func_quote_for_eval_result
 #          my_silent_option_result=$func_quote_for_eval_result
 #        fi
 #
 #        $args_changed
 #    }
 #    func_add_hook func_parse_options my_silent_option
 #
@ -1633,32 +1611,16 @@ func_run_hooks ()
 #        $opt_silent && $opt_verbose && func_fatal_help "\
 #    '--silent' and '--verbose' options are mutually exclusive."
 #
-#        false
+#        func_quote_for_eval ${1+"$@"}
 #        my_option_validation_result=$func_quote_for_eval_result
 #    }
 #    func_add_hook func_validate_options my_option_validation
 #
-# You'll also need to manually amend $usage_message to reflect the extra
+# You'll alse need to manually amend $usage_message to reflect the extra
 # options you parse.  It's preferable to append if you can, so that
 # multiple option parsing hooks can be added safely.
 # func_options_finish [ARG]...
 # ----------------------------
 # Finishing the option parse loop (call 'func_options' hooks ATM).
 func_options_finish ()
 {
    $debug_cmd
    _G_func_options_finish_exit=false
    if func_run_hooks func_options ${1+"$@"}; then
      func_options_finish_result=$func_run_hooks_result
      _G_func_options_finish_exit=:
    fi
    $_G_func_options_finish_exit
 }
 # func_options [ARG]...
 # ---------------------
 # All the functions called inside func_options are hookable. See the
@ -1668,28 +1630,17 @@ func_options ()
 {
    $debug_cmd
-    _G_rc_options=false
+    func_options_prep ${1+"$@"}
    eval func_parse_options \
        ${func_options_prep_result+"$func_options_prep_result"}
    eval func_validate_options \
        ${func_parse_options_result+"$func_parse_options_result"}
-    for my_func in options_prep parse_options validate_options options_finish
+    eval func_run_hooks func_options \
-    do
+        ${func_validate_options_result+"$func_validate_options_result"}
      if eval func_$my_func '${1+"$@"}'; then
        eval _G_res_var='$'"func_${my_func}_result"
        eval set dummy "$_G_res_var" ; shift
        _G_rc_options=:
      fi
    done
-    # Save modified positional parameters for caller.  As a top-level
+    # save modified positional parameters for caller
-    # options-parser function we always need to set the 'func_options_result'
+    func_options_result=$func_run_hooks_result
    # variable (regardless the $_G_rc_options value).
    if $_G_rc_options; then
      func_options_result=$_G_res_var
    else
      func_quote_for_eval ${1+"$@"}
      func_options_result=$func_quote_for_eval_result
    fi
    $_G_rc_options
 }
@ -1698,9 +1649,9 @@ func_options ()
 # All initialisations required before starting the option parse loop.
 # Note that when calling hook functions, we pass through the list of
 # positional parameters.  If a hook function modifies that list, and
-# needs to propagate that back to rest of this script, then the complete
+# needs to propogate that back to rest of this script, then the complete
 # modified list must be put in 'func_run_hooks_result' before
-# returning $EXIT_SUCCESS (otherwise $EXIT_FAILURE is returned).
+# returning.
 func_hookable func_options_prep
 func_options_prep ()
 {
@ -1710,14 +1661,10 @@ func_options_prep ()
    opt_verbose=false
    opt_warning_types=
-    _G_rc_options_prep=false
+    func_run_hooks func_options_prep ${1+"$@"}
    if func_run_hooks func_options_prep ${1+"$@"}; then
      _G_rc_options_prep=:
      # save modified positional parameters for caller
      func_options_prep_result=$func_run_hooks_result
    fi
-    $_G_rc_options_prep
+    # save modified positional parameters for caller
    func_options_prep_result=$func_run_hooks_result
 }
@ -1731,20 +1678,18 @@ func_parse_options ()
    func_parse_options_result=
    _G_rc_parse_options=false
    # this just eases exit handling
    while test $# -gt 0; do
      # Defer to hook functions for initial option parsing, so they
      # get priority in the event of reusing an option name.
-      if func_run_hooks func_parse_options ${1+"$@"}; then
+      func_run_hooks func_parse_options ${1+"$@"}
-        eval set dummy "$func_run_hooks_result"; shift
+
-        _G_rc_parse_options=:
+      # Adjust func_parse_options positional parameters to match
-      fi
+      eval set dummy "$func_run_hooks_result"; shift
      # Break out of the loop if we already parsed every option.
      test $# -gt 0 || break
      _G_match_parse_options=:
      _G_opt=$1
      shift
      case $_G_opt in
@ -1759,10 +1704,7 @@ func_parse_options ()
 		      ;;
        --warnings|--warning|-W)
-                      if test $# = 0 && func_missing_arg $_G_opt; then
+                      test $# = 0 && func_missing_arg $_G_opt && break
                        _G_rc_parse_options=:
                        break
                      fi
                      case " $warning_categories $1" in
                        *" $1 "*)
                          # trailing space prevents matching last $1 above
@ -1815,25 +1757,15 @@ func_parse_options ()
                      shift
                      ;;
-        --)           _G_rc_parse_options=: ; break ;;
+        --)           break ;;
        -*)           func_fatal_help "unrecognised option: '$_G_opt'" ;;
-        *)            set dummy "$_G_opt" ${1+"$@"}; shift
+        *)            set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
                      _G_match_parse_options=false
                      break
                      ;;
      esac
      $_G_match_parse_options && _G_rc_parse_options=:
    done
-
+    # save modified positional parameters for caller
-    if $_G_rc_parse_options; then
+    func_quote_for_eval ${1+"$@"}
-      # save modified positional parameters for caller
+    func_parse_options_result=$func_quote_for_eval_result
      func_quote_for_eval ${1+"$@"}
      func_parse_options_result=$func_quote_for_eval_result
    fi
    $_G_rc_parse_options
 }
@ -1846,21 +1778,16 @@ func_validate_options ()
 {
    $debug_cmd
    _G_rc_validate_options=false
    # Display all warnings if -W was not given.
    test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
-    if func_run_hooks func_validate_options ${1+"$@"}; then
+    func_run_hooks func_validate_options ${1+"$@"}
      # save modified positional parameters for caller
      func_validate_options_result=$func_run_hooks_result
      _G_rc_validate_options=:
    fi
    # Bail if the options were screwed!
    $exit_cmd $EXIT_FAILURE
-    $_G_rc_validate_options
+    # save modified positional parameters for caller
    func_validate_options_result=$func_run_hooks_result
 }
@ -2141,7 +2068,7 @@ include the following information:
       compiler:       $LTCC
       compiler flags: $LTCFLAGS
       linker:         $LD (gnu? $with_gnu_ld)
-       version:        $progname $scriptversion Debian-2.4.6-15build2
+       version:        $progname $scriptversion Debian-2.4.6-2
       automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
       autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
@ -2343,8 +2270,6 @@ libtool_options_prep ()
    nonopt=
    preserve_args=
    _G_rc_lt_options_prep=:
    # Shorthand for --mode=foo, only valid as the first argument
    case $1 in
    clean|clea|cle|cl)
@ -2368,18 +2293,11 @@ libtool_options_prep ()
    uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
      shift; set dummy --mode uninstall ${1+"$@"}; shift
      ;;
    *)
      _G_rc_lt_options_prep=false
      ;;
    esac
-    if $_G_rc_lt_options_prep; then
+    # Pass back the list of options.
-      # Pass back the list of options.
+    func_quote_for_eval ${1+"$@"}
-      func_quote_for_eval ${1+"$@"}
+    libtool_options_prep_result=$func_quote_for_eval_result
      libtool_options_prep_result=$func_quote_for_eval_result
    fi
    $_G_rc_lt_options_prep
 }
 func_add_hook func_options_prep libtool_options_prep
@ -2391,12 +2309,9 @@ libtool_parse_options ()
 {
    $debug_cmd
    _G_rc_lt_parse_options=false
    # Perform our own loop to consume as many options as possible in
    # each iteration.
    while test $# -gt 0; do
      _G_match_lt_parse_options=:
      _G_opt=$1
      shift
      case $_G_opt in
@ -2471,22 +2386,15 @@ libtool_parse_options ()
                        func_append preserve_args " $_G_opt"
                        ;;
-        # An option not handled by this hook function:
+	# An option not handled by this hook function:
-        *)              set dummy "$_G_opt" ${1+"$@"} ; shift
+        *)		set dummy "$_G_opt" ${1+"$@"};	shift; break  ;;
                        _G_match_lt_parse_options=false
                        break
                        ;;
      esac
      $_G_match_lt_parse_options && _G_rc_lt_parse_options=:
    done
    if $_G_rc_lt_parse_options; then
      # save modified positional parameters for caller
      func_quote_for_eval ${1+"$@"}
      libtool_parse_options_result=$func_quote_for_eval_result
    fi
-    $_G_rc_lt_parse_options
+    # save modified positional parameters for caller
    func_quote_for_eval ${1+"$@"}
    libtool_parse_options_result=$func_quote_for_eval_result
 }
 func_add_hook func_parse_options libtool_parse_options
@ -7367,13 +7275,10 @@ func_mode_link ()
      # -specs=*             GCC specs files
      # -stdlib=*            select c++ std lib with clang
      # -fsanitize=*         Clang/GCC memory and address sanitizer
      # -fuse-ld=*           Linker select flags for GCC
      # -static-*            direct GCC to link specific libraries statically
      # -fcilkplus           Cilk Plus language extension features for C/C++
      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
-      -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus)
+      -specs=*|-fsanitize=*)
        func_quote_for_eval "$arg"
 	arg=$func_quote_for_eval_result
        func_append compile_command " $arg"
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -89,11 +89,10 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = m4
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@ -136,9 +135,8 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CSCOPE = @CSCOPE@
 CTAGS = @CTAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
@ -156,7 +154,6 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 ENCHANT_CFLAGS = @ENCHANT_CFLAGS@
 ENCHANT_LIBS = @ENCHANT_LIBS@
 ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@ -205,8 +202,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCRE2_CFLAGS = @PCRE2_CFLAGS@
 PCRE2_LIBS = @PCRE2_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@ -219,10 +214,6 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WX_LIBS = @WX_LIBS@
 XGETTEXT = @XGETTEXT@
 XML2_CFLAGS = @XML2_CFLAGS@
 XML2_LIBS = @XML2_LIBS@
 XSLT_CFLAGS = @XSLT_CFLAGS@
 XSLT_LIBS = @XSLT_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@ -314,8 +305,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@ -338,10 +329,8 @@ ctags CTAGS:
 cscope cscopelist:
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
--- a/m4/intltool.m4
+++ b/m4/intltool.m4
@ -1,212 +0,0 @@
 ## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*-
 ## Copyright (C) 2001 Eazel, Inc.
 ## Author: Maciej Stachowiak <mjs@noisehavoc.org>
 ##         Kenneth Christiansen <kenneth@gnu.org>
 ##
 ## 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
 ## the Free Software Foundation; either version 2 of the License, or
 ## (at your option) any later version.
 ##
 ## This program is distributed in the hope that it will be useful, but
 ## WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ##
 ## As a special exception to the GNU General Public License, if you
 ## distribute this file as part of a program that contains a
 ## configuration script generated by Autoconf, you may include it under
 ## the same distribution terms that you use for the rest of that program.
 dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
 # serial 42 IT_PROG_INTLTOOL
 AC_DEFUN([IT_PROG_INTLTOOL], [
 AC_PREREQ([2.50])dnl
 AC_REQUIRE([AM_NLS])dnl
 case "$am__api_version" in
    1.[01234])
 	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
    ;;
    *)
    ;;
 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])
    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.])
 fi
 AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
 AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
 AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
 if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
    AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
 fi
 if test -z "$AM_DEFAULT_VERBOSITY"; then
  AM_DEFAULT_VERBOSITY=1
 fi
 AC_SUBST([AM_DEFAULT_VERBOSITY])
 INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
 INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
 INTLTOOL__v_MERGE_0='@echo "  ITMRG " [$]@;'
 AC_SUBST(INTLTOOL_V_MERGE)
 AC_SUBST(INTLTOOL__v_MERGE_)
 AC_SUBST(INTLTOOL__v_MERGE_0)
 INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
 intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
 intltool__v_merge_options_0='-q'
 AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
 AC_SUBST(intltool__v_merge_options_)
 AC_SUBST(intltool__v_merge_options_0)
  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
 INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@'
     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
 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 $< [$]@' 
  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
 _IT_SUBST(INTLTOOL_DESKTOP_RULE)
 _IT_SUBST(INTLTOOL_DIRECTORY_RULE)
 _IT_SUBST(INTLTOOL_KEYS_RULE)
 _IT_SUBST(INTLTOOL_PROP_RULE)
 _IT_SUBST(INTLTOOL_OAF_RULE)
 _IT_SUBST(INTLTOOL_PONG_RULE)
 _IT_SUBST(INTLTOOL_SERVER_RULE)
 _IT_SUBST(INTLTOOL_SHEET_RULE)
 _IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
 _IT_SUBST(INTLTOOL_UI_RULE)
 _IT_SUBST(INTLTOOL_XAM_RULE)
 _IT_SUBST(INTLTOOL_KBD_RULE)
 _IT_SUBST(INTLTOOL_XML_RULE)
 _IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
 _IT_SUBST(INTLTOOL_CAVES_RULE)
 _IT_SUBST(INTLTOOL_SCHEMAS_RULE)
 _IT_SUBST(INTLTOOL_THEME_RULE)
 _IT_SUBST(INTLTOOL_SERVICE_RULE)
 _IT_SUBST(INTLTOOL_POLICY_RULE)
 # Check the gettext tools to make sure they are GNU
 AC_PATH_PROG(XGETTEXT, xgettext)
 AC_PATH_PROG(MSGMERGE, msgmerge)
 AC_PATH_PROG(MSGFMT, msgfmt)
 AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
 if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
 fi
 xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
 mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
 mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
 if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
 fi
 AC_PATH_PROG(INTLTOOL_PERL, perl)
 if test -z "$INTLTOOL_PERL"; then
   AC_MSG_ERROR([perl not found])
 fi
 AC_MSG_CHECKING([for perl >= 5.8.1])
 $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
 if test $? -ne 0; then
   AC_MSG_ERROR([perl 5.8.1 is required for intltool])
 else
   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
   AC_MSG_RESULT([$IT_PERL_VERSION])
 fi
 if test "x$2" != "xno-xml"; then
   AC_MSG_CHECKING([for XML::Parser])
   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
       AC_MSG_RESULT([ok])
   else
       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
   fi
 fi
 # Substitute ALL_LINGUAS so we can use it in po/Makefile
 AC_SUBST(ALL_LINGUAS)
 IT_PO_SUBDIR([po])
 ])
 # IT_PO_SUBDIR(DIRNAME)
 # ---------------------
 # All po subdirs have to be declared with this macro; the subdir "po" is
 # declared by IT_PROG_INTLTOOL.
 #
 AC_DEFUN([IT_PO_SUBDIR],
 [AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
 dnl
 dnl The following CONFIG_COMMANDS should be executed at the very end
 dnl of config.status.
 AC_CONFIG_COMMANDS_PRE([
  AC_CONFIG_COMMANDS([$1/stamp-it], [
    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
       AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
    fi
    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
    >"$1/stamp-it.tmp"
    [sed '/^#/d
 	 s/^[[].*] *//
 	 /^[ 	]*$/d
 	'"s|^|	$ac_top_srcdir/|" \
      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
    ]
    [sed '/^POTFILES =/,/[^\\]$/ {
 		/^POTFILES =/!d
 		r $1/POTFILES
 	  }
 	 ' "$1/Makefile.in" >"$1/Makefile"]
    rm -f "$1/Makefile.tmp"
    mv "$1/stamp-it.tmp" "$1/stamp-it"
  ])
 ])dnl
 ])
 # _IT_SUBST(VARIABLE)
 # -------------------
 # Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
 #
 AC_DEFUN([_IT_SUBST],
 [
 AC_SUBST([$1])
 m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
 ]
 )
 # deprecated macros
 AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
 # A hint is needed for aclocal from Automake <= 1.9.4:
 # AC_DEFUN([AC_PROG_INTLTOOL], ...)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@ -1041,8 +1041,8 @@ int forced_loaded() { return 2;}
 _LT_EOF
      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
-      echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-      $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
      cat > conftest.c << _LT_EOF
@ -1071,11 +1071,11 @@ _LT_EOF
      # to the OS version, if on x86, and 10.4, the deployment
      # target defaults to 10.4. Don't you love it?
      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[[912]]*)
+	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
 	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
 	10.[[012]][[,.]]*)
 	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-	10.*|11.*)
+	10.*)
 	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
      esac
    ;;
@ -1492,7 +1492,7 @@ need_locks=$enable_libtool_lock
 m4_defun([_LT_PROG_AR],
 [AC_CHECK_TOOLS(AR, [ar], false)
 : ${AR=ar}
-: ${AR_FLAGS=cr}
+: ${AR_FLAGS=cru}
 _LT_DECL([], [AR], [1], [The archiver])
 _LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
@ -4063,8 +4063,7 @@ _LT_EOF
  if AC_TRY_EVAL(ac_compile); then
    # Now try to grab the symbols.
    nlist=conftest.nm
-    $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
    if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then
      # Try sorting and uniquifying the output.
      if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@ -4704,12 +4703,6 @@ m4_if([$1], [CXX], [
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
        ;;
      # flang / f18. f95 an alias for gfortran or flang on Debian
      flang* | f18* | f95*)
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
        ;;
      # icc used to be incompatible with GCC.
      # ICC 10 doesn't accept -KPIC any more.
      icc* | ifort*)
@ -6445,7 +6438,7 @@ if test yes != "$_lt_caught_CXX_error"; then
      # Commands to make compiler produce verbose output that lists
      # what "hidden" libraries, object files and flags are used when
      # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
    else
      GXX=no
@ -6820,7 +6813,7 @@ if test yes != "$_lt_caught_CXX_error"; then
            # explicitly linking system object files so we need to strip them
            # from the output so that they don't get included in the library
            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
            ;;
          *)
            if test yes = "$GXX"; then
@ -6885,7 +6878,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 	    ;;
          *)
 	    if test yes = "$GXX"; then
@ -7224,7 +7217,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	      # Commands to make compiler produce verbose output that lists
 	      # what "hidden" libraries, object files and flags are used when
 	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 	    else
 	      # FIXME: insert proper C++ library support
@ -7308,7 +7301,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 	      else
 	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
 	        # platform.
@ -7319,7 +7312,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 	      fi
 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
--- a/m4/ltsugar.m4
+++ b/m4/ltsugar.m4
@ -1,7 +1,6 @@
 # ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 #
-# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
 # Foundation, Inc.
 # Written by Gary V. Vaughan, 2004
 #
 # This file is free software; the Free Software Foundation gives
@ -34,7 +33,7 @@ m4_define([_lt_join],
 # ------------
 # Manipulate m4 lists.
 # These macros are necessary as long as will still need to support
-# Autoconf-2.59, which quotes differently.
+# Autoconf-2.59 which quotes differently.
 m4_define([lt_car], [[$1]])
 m4_define([lt_cdr],
 [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
@ -45,7 +44,7 @@ m4_define([lt_unquote], $1)
 # lt_append(MACRO-NAME, STRING, [SEPARATOR])
 # ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
 # Note that neither SEPARATOR nor STRING are expanded; they are appended
 # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
 # No SEPARATOR is output if MACRO-NAME was previously undefined (different
--- a/m4/lt~obsolete.m4
+++ b/m4/lt~obsolete.m4
@ -1,7 +1,6 @@
 # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 #
-#   Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
+#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
 #   Foundation, Inc.
 #   Written by Scott James Remnant, 2004.
 #
 # This file is free software; the Free Software Foundation gives
@ -12,7 +11,7 @@
 # These exist entirely to fool aclocal when bootstrapping libtool.
 #
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
 # which have later been changed to m4_define as they aren't part of the
 # exported API, or moved to Autoconf or Automake where they belong.
 #
--- a/452
+++ b/452
@ -1,10 +1,11 @@
 #! /bin/sh
-# Common wrapper for a few potentially missing GNU programs.
+# Common stub for a few missing GNU programs while installing.
-scriptversion=2018-03-07.03; # UTC
+scriptversion=2005-06-08.21
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+#   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 # 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
@ -17,7 +18,9 @@ scriptversion=2018-03-07.03; # UTC
 # 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, see <https://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@ -25,40 +28,63 @@ scriptversion=2018-03-07.03; # UTC
 # the same distribution terms that you use for the rest of that program.
 if test $# -eq 0; then
-  echo 1>&2 "Try '$0 --help' for more information"
+  echo 1>&2 "Try \`$0 --help' for more information"
  exit 1
 fi
-case $1 in
+run=:
-  --is-lightweight)
+# In the cases where this matters, `missing' is being run in the
-    # Used by our autoconf macros to check whether the available missing
+# srcdir already.
-    # script is modern enough.
+if test -f configure.ac; then
-    exit 0
+  configure_ac=configure.ac
-    ;;
+else
  configure_ac=configure.in
 fi
-  --run)
+msg="missing on your system"
-    # Back-compat with the calling convention used by older automake.
+
-    shift
+case "$1" in
-    ;;
+--run)
  # Try to run requested program, and just exit if it succeeds.
  run=
  shift
  "$@" && exit 0
  # Exit code 63 means version mismatch.  This often happens
  # when the user try to use an ancient version of a tool on
  # a file that requires a minimum version.  In this case we
  # we should proceed has if the program had been absent, or
  # if --run hadn't been passed.
  if test $? = 63; then
    run=:
    msg="probably too old"
  fi
  ;;
  -h|--h|--he|--hel|--help)
    echo "\
 $0 [OPTION]... PROGRAM [ARGUMENT]...
-Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-to PROGRAM being missing or too old.
+error status if there is no known handling for PROGRAM.
 Options:
  -h, --help      display this help and exit
  -v, --version   output version information and exit
  --run           try to run the given command, and emulate it if it fails
 Supported PROGRAM values:
-  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  aclocal      touch file \`aclocal.m4'
-  bison     yacc      flex         lex       help2man
+  autoconf     touch file \`configure'
-
+  autoheader   touch file \`config.h.in'
-Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+  automake     touch all \`Makefile.in' files
-'g' are ignored when checking the name.
+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
  flex         create \`lex.yy.c', if possible, from existing .c
  help2man     touch the output file
  lex          create \`lex.yy.c', if possible, from existing .c
  makeinfo     touch the output file
  tar          try tar, gnutar, gtar, then tar without non-portable flags
  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 Send bug reports to <bug-automake@gnu.org>."
    exit $?
@ -70,146 +96,266 @@ Send bug reports to <bug-automake@gnu.org>."
    ;;
  -*)
-    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try '$0 --help' for more information"
+    echo 1>&2 "Try \`$0 --help' for more information"
    exit 1
    ;;
 esac
-# Run the given program, remember its exit status.
+# Now exit if we have it, but it failed.  Also exit now if we
-"$@"; st=$?
+# don't have it and --version was passed (most likely to detect
-
+# the program).
-# If it succeeded, we are done.
+case "$1" in
-test $st -eq 0 && exit 0
+  lex|yacc)
-
+    # Not GNU programs, they don't have --version.
 # Also exit now if we it failed (or wasn't found), and '--version' was
 # passed; such an option is passed most likely to detect whether the
 # program is present and works.
 case $2 in --version|--help) exit $st;; esac
 # Exit code 63 means version mismatch.  This often happens when the user
 # tries to use an ancient version of a tool on a file that requires a
 # minimum version.
 if test $st -eq 63; then
  msg="probably too old"
 elif test $st -eq 127; then
  # Program was missing.
  msg="missing on your system"
 else
  # Program was found and executed, but failed.  Give up.
  exit $st
 fi
 perl_URL=https://www.perl.org/
 flex_URL=https://github.com/westes/flex
 gnu_software_URL=https://www.gnu.org/software
 program_details ()
 {
  case $1 in
    aclocal|automake)
      echo "The '$1' program is part of the GNU Automake package:"
      echo "<$gnu_software_URL/automake>"
      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
      echo "<$gnu_software_URL/autoconf>"
      echo "<$gnu_software_URL/m4/>"
      echo "<$perl_URL>"
      ;;
    autoconf|autom4te|autoheader)
      echo "The '$1' program is part of the GNU Autoconf package:"
      echo "<$gnu_software_URL/autoconf/>"
      echo "It also requires GNU m4 and Perl in order to run:"
      echo "<$gnu_software_URL/m4/>"
      echo "<$perl_URL>"
      ;;
  esac
 }
 give_advice ()
 {
  # Normalize program name to check for.
  normalized_program=`echo "$1" | sed '
    s/^gnu-//; t
    s/^gnu//; t
    s/^g//; t'`
  printf '%s\n' "'$1' is $msg."
  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
  case $normalized_program in
    autoconf*)
      echo "You should only need it if you modified 'configure.ac',"
      echo "or m4 files included by it."
      program_details 'autoconf'
      ;;
    autoheader*)
      echo "You should only need it if you modified 'acconfig.h' or"
      echo "$configure_deps."
      program_details 'autoheader'
      ;;
    automake*)
      echo "You should only need it if you modified 'Makefile.am' or"
      echo "$configure_deps."
      program_details 'automake'
      ;;
    aclocal*)
      echo "You should only need it if you modified 'acinclude.m4' or"
      echo "$configure_deps."
      program_details 'aclocal'
      ;;
   autom4te*)
      echo "You might have modified some maintainer files that require"
      echo "the 'autom4te' program to be rebuilt."
      program_details 'autom4te'
      ;;
    bison*|yacc*)
      echo "You should only need it if you modified a '.y' file."
      echo "You may want to install the GNU Bison package:"
      echo "<$gnu_software_URL/bison/>"
      ;;
    lex*|flex*)
      echo "You should only need it if you modified a '.l' file."
      echo "You may want to install the Fast Lexical Analyzer package:"
      echo "<$flex_URL>"
      ;;
    help2man*)
      echo "You should only need it if you modified a dependency" \
           "of a man page."
      echo "You may want to install the GNU Help2man package:"
      echo "<$gnu_software_URL/help2man/>"
    ;;
    makeinfo*)
      echo "You should only need it if you modified a '.texi' file, or"
      echo "any other file indirectly affecting the aspect of the manual."
      echo "You might want to install the Texinfo package:"
      echo "<$gnu_software_URL/texinfo/>"
      echo "The spurious makeinfo call might also be the consequence of"
      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
      echo "want to install GNU make:"
      echo "<$gnu_software_URL/make/>"
      ;;
    *)
      echo "You might have modified some files without having the proper"
      echo "tools for further handling them.  Check the 'README' file, it"
      echo "often tells you about the needed prerequisites for installing"
      echo "this package.  You may also peek at any GNU archive site, in"
      echo "case some other package contains this missing '$1' program."
      ;;
  esac
 }
-give_advice "$1" | sed -e '1s/^/WARNING: /' \
+  tar)
-                       -e '2,$s/^/         /' >&2
+    if test -n "$run"; then
       echo 1>&2 "ERROR: \`tar' requires --run"
       exit 1
    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
       exit 1
    fi
    ;;
-# Propagate the correct exit status (expected to be 127 for a program
+  *)
-# not found, 63 for a program that failed due to version mismatch).
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-exit $st
+       # We have it, but it failed.
       exit 1
    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
       # Could not run --version or --help.  This is probably someone
       # running `$TOOL --version' or `$TOOL --help' to check whether
       # $TOOL exists and not knowing $TOOL uses missing.
       exit 1
    fi
    ;;
 esac
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
 case "$1" in
  aclocal*)
    echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
         to install the \`Automake' and \`Perl' packages.  Grab them from
         any GNU archive site."
    touch aclocal.m4
    ;;
  autoconf)
    echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
         you modified \`${configure_ac}'.  You might want to install the
         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
         archive site."
    touch configure
    ;;
  autoheader)
    echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
         from any GNU archive site."
    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
    test -z "$files" && files="config.h"
    touch_files=
    for f in $files; do
      case "$f" in
      *:*) touch_files="$touch_files "`echo "$f" |
 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
      *) touch_files="$touch_files $f.in";;
      esac
    done
    touch $touch_files
    ;;
  automake*)
    echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
         You might want to install the \`Automake' and \`Perl' packages.
         Grab them from any GNU archive site."
    find . -type f -name Makefile.am -print |
 	   sed 's/\.am$/.in/' |
 	   while read f; do touch "$f"; done
    ;;
  autom4te)
    echo 1>&2 "\
 WARNING: \`$1' is needed, but is $msg.
         You might have modified some files without having the
         proper tools for further handling them.
         You can get \`$1' as part of \`Autoconf' from any GNU
         archive site."
    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
    if test -f "$file"; then
 	touch $file
    else
 	test -z "$file" || exec >$file
 	echo "#! /bin/sh"
 	echo "# Created by GNU Automake missing as a replacement of"
 	echo "#  $ $@"
 	echo "exit 0"
 	chmod +x $file
 	exit 1
    fi
    ;;
  bison|yacc)
    echo 1>&2 "\
 WARNING: \`$1' $msg.  You should only need it if
         you modified a \`.y' file.  You may need the \`Bison' package
         in order for those modifications to take effect.  You can get
         \`Bison' from any GNU archive site."
    rm -f y.tab.c y.tab.h
    if [ $# -ne 1 ]; then
        eval LASTARG="\${$#}"
 	case "$LASTARG" in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
 	    if [ -f "$SRCFILE" ]; then
 	         cp "$SRCFILE" y.tab.c
 	    fi
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
 	    if [ -f "$SRCFILE" ]; then
 	         cp "$SRCFILE" y.tab.h
 	    fi
 	  ;;
 	esac
    fi
    if [ ! -f y.tab.h ]; then
 	echo >y.tab.h
    fi
    if [ ! -f y.tab.c ]; then
 	echo 'main() { return 0; }' >y.tab.c
    fi
    ;;
  lex|flex)
    echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
         you modified a \`.l' file.  You may need the \`Flex' package
         in order for those modifications to take effect.  You can get
         \`Flex' from any GNU archive site."
    rm -f lex.yy.c
    if [ $# -ne 1 ]; then
        eval LASTARG="\${$#}"
 	case "$LASTARG" in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
 	    if [ -f "$SRCFILE" ]; then
 	         cp "$SRCFILE" lex.yy.c
 	    fi
 	  ;;
 	esac
    fi
    if [ ! -f lex.yy.c ]; then
 	echo 'main() { return 0; }' >lex.yy.c
    fi
    ;;
  help2man)
    echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
 	 you modified a dependency of a manual page.  You may need the
 	 \`Help2man' package in order for those modifications to take
 	 effect.  You can get \`Help2man' from any GNU archive site."
    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
    if test -z "$file"; then
 	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
    fi
    if [ -f "$file" ]; then
 	touch $file
    else
 	test -z "$file" || exec >$file
 	echo ".ab help2man is required to generate this page"
 	exit 1
    fi
    ;;
  makeinfo)
    echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
         you modified a \`.texi' or \`.texinfo' file, or any other file
         indirectly affecting the aspect of the manual.  The spurious
         call might also be the consequence of using a buggy \`make' (AIX,
         DU, IRIX).  You might want to install the \`Texinfo' package or
         the \`GNU make' package.  Grab either from any GNU archive site."
    # The file to touch is that specified with -o ...
    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
    if test -z "$file"; then
      # ... or it is the one specified with @setfilename ...
      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
      # ... or it is derived from the source name (dir/f.texi becomes f.info)
      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
    fi
    # If the file does not exist, the user really needs makeinfo;
    # let's fail without touching anything.
    test -f $file || exit 1
    touch $file
    ;;
  tar)
    shift
    # We have already tried tar in the generic part.
    # Look for gnutar/gtar before invocation to avoid ugly error
    # messages.
    if (gnutar --version > /dev/null 2>&1); then
       gnutar "$@" && exit 0
    fi
    if (gtar --version > /dev/null 2>&1); then
       gtar "$@" && exit 0
    fi
    firstarg="$1"
    if shift; then
 	case "$firstarg" in
 	*o*)
 	    firstarg=`echo "$firstarg" | sed s/o//`
 	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
 	case "$firstarg" in
 	*h*)
 	    firstarg=`echo "$firstarg" | sed s/h//`
 	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
    fi
    echo 1>&2 "\
 WARNING: I can't seem to be able to run \`tar' with the given arguments.
         You may want to install GNU tar or Free paxutils, or check the
         command line arguments."
    exit 1
    ;;
  *)
    echo 1>&2 "\
 WARNING: \`$1' is needed, and is $msg.
         You might have modified some files without having the
         proper tools for further handling them.  Check the \`README' file,
         it often tells you about the needed prerequisites for installing
         this package.  You may also peek at any GNU archive site, in case
         some other package would contain this missing \`$1' program."
    exit 1
    ;;
 esac
 exit 0
 # Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "$"
 # time-stamp-end: "; # UTC"
 # End:
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@ -33,7 +33,8 @@ exec_prefix = @exec_prefix@
 datadir = @datadir@
 datarootdir = @datarootdir@
 libdir = @libdir@
-localedir = @localedir@
+DATADIRNAME = @DATADIRNAME@
 itlocaledir = $(prefix)/$(DATADIRNAME)/locale
 subdir = po
 install_sh = @install_sh@
 # Automake >= 1.8 provides @mkdir_p@.
@ -62,7 +63,9 @@ USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGU
 POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
 DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
-EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
+EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS \
 	Preferences01.png Preferences02.png Settings.png translate.txt \
 	Rules-quot *.gmo *.pot *.sed *.sin
 POTFILES = \
 # This comment gets stripped out
@ -79,7 +82,7 @@ INTLTOOL__v_MSGFMT_0 = @echo "  MSGFMT" $@;
 .po.pox:
 	$(MAKE) $(GETTEXT_PACKAGE).pot
-	$(MSGMERGE) $* $(GETTEXT_PACKAGE).pot -o $*.pox
+	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
 .po.mo:
 	$(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
@ -107,7 +110,7 @@ install-data-no: all
 install-data-yes: all
 	linguas="$(USE_LINGUAS)"; \
 	for lang in $$linguas; do \
-	  dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
+	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
 	  $(mkdir_p) $$dir; \
 	  if test -r $$lang.gmo; then \
 	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
@ -141,8 +144,8 @@ install-exec installcheck:
 uninstall:
 	linguas="$(USE_LINGUAS)"; \
 	for lang in $$linguas; do \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
 	done
 check: all $(GETTEXT_PACKAGE).pot
--- a/po/ca.gmo
+++ b/po/ca.gmo
--- a/po/de.gmo
+++ b/po/de.gmo
--- a/po/en_US.gmo
+++ b/po/en_US.gmo
--- a/po/es.gmo
+++ b/po/es.gmo
--- a/po/fr.gmo
+++ b/po/fr.gmo
--- a/po/it.gmo
+++ b/po/it.gmo
--- a/po/km.gmo
+++ b/po/km.gmo
--- a/po/nl.gmo
+++ b/po/nl.gmo
--- a/po/ru.gmo
+++ b/po/ru.gmo
--- a/po/sk.gmo
+++ b/po/sk.gmo
--- a/po/sv.gmo
+++ b/po/sv.gmo
--- a/po/uk_UA.gmo
+++ b/po/uk_UA.gmo
--- a/po/xmlcopyeditor.pot
+++ b/po/xmlcopyeditor.pot
--- a/po/zh_CN.gmo
+++ b/po/zh_CN.gmo
--- a/po/zh_TW.gmo
+++ b/po/zh_TW.gmo
--- a/src/.cproject
+++ b/src/.cproject
@ -5,13 +5,12 @@
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716" moduleId="org.eclipse.cdt.core.settings" name="DebugWx-x86">
 				<macros>
 					<stringMacro name="WXVER" type="VALUE_TEXT" value="31"/>
-					<stringMacro name="BOOSTINC" type="VALUE_TEXT" value="E:/lib/boost_1_72_0"/>
+					<stringMacro name="BOOSTINC" type="VALUE_TEXT" value="E:/lib/boost_1_70_0"/>
 					<stringMacro name="WXWIDGETS" type="VALUE_TEXT" value="E:/wxWidgets"/>
 					<stringMacro name="WX_SETUP" type="VALUE_TEXT" value="E:/wxWidgets/lib/gcc_dll32/mswud"/>
 				</macros>
 				<externalSettings/>
 				<extensions>
-					<extension id="org.eclipse.cdt.core.PE64" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
@ -22,7 +21,7 @@
 					<folderInfo id="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.mingw.exe.debug.1964333246" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.exe.debug">
 							<targetPlatform id="cdt.managedbuild.target.gnu.platform.mingw.exe.debug.1899344235" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.mingw.exe.debug"/>
-							<builder buildPath="${workspace_loc:/XmlCopyEditor/Debug}" id="cdt.managedbuild.tool.gnu.builder.mingw.base.1401964989" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" parallelBuildOn="true" parallelizationNumber="4" superClass="cdt.managedbuild.tool.gnu.builder.mingw.base"/>
+							<builder buildPath="${workspace_loc:/XmlCopyEditor/Debug}" id="cdt.managedbuild.tool.gnu.builder.mingw.base.1401964989" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" superClass="cdt.managedbuild.tool.gnu.builder.mingw.base"/>
 							<tool command="as" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" id="cdt.managedbuild.tool.gnu.assembler.mingw.exe.debug.155221793" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.exe.debug">
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.579522832" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
@ -32,10 +31,9 @@
 								<option id="gnu.cpp.compiler.mingw.exe.debug.option.debugging.level.693304093" name="Debug Level" superClass="gnu.cpp.compiler.mingw.exe.debug.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.334981297" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="${BOOSTINC}"/>
 									<listOptionValue builtIn="false" value="${MINGW_HOME}/include/libxml2"/>
 									<listOptionValue builtIn="false" value="${WXWIDGETS}/include"/>
 									<listOptionValue builtIn="false" value="${WXWIDGETS}/contrib/include"/>
-									<listOptionValue builtIn="false" value="${WX_SETUP}"/>
+									<listOptionValue builtIn="false" value="${WXWIDGETS}/lib/gcc_dll32/mswud"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.other.other.1952331323" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -fmessage-length=0" valueType="string"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.preprocessor.def.1236209686" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols">
@ -70,12 +68,11 @@
 									<listOptionValue builtIn="false" value="wxregexud"/>
 									<listOptionValue builtIn="false" value="xslt"/>
 									<listOptionValue builtIn="false" value="xml2"/>
-									<listOptionValue builtIn="false" value="pcre2-8"/>
+									<listOptionValue builtIn="false" value="pcre"/>
 									<listOptionValue builtIn="false" value="xerces-c"/>
 									<listOptionValue builtIn="false" value="curl"/>
 									<listOptionValue builtIn="false" value="aspell"/>
 									<listOptionValue builtIn="false" value="iconv"/>
 									<listOptionValue builtIn="false" value="imm32"/>
 									<listOptionValue builtIn="false" value="kernel32"/>
 									<listOptionValue builtIn="false" value="user32"/>
 									<listOptionValue builtIn="false" value="gdi32"/>
@ -110,7 +107,7 @@
 						</toolChain>
 					</folderInfo>
 					<fileInfo id="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.1997030457" name="xmlcopyeditor.rc" rcbsApplicability="override" resourcePath="xmlcopyeditor.rc" toolsToInvoke="org.eclipse.cdt.managedbuilder.ui.rcbs.834600059">
-						<tool command="windres.exe ${RCDEFS} ${RCINCS} -I${WXWIDGETS} -I${WXWIDGETS}/include -I${WX_SETUP} -i ${InputFileRelPath} -Ocoff -o ${OutputFileRelPath}" customBuildStep="true" id="org.eclipse.cdt.managedbuilder.ui.rcbs.834600059" name="Resource Custom Build Step">
+						<tool command="windres.exe ${RCDEFS} ${RCINCS} -I${WXWIDGETS}/include -i ${InputFileRelPath} -Ocoff -o ${OutputFileRelPath}" customBuildStep="true" id="org.eclipse.cdt.managedbuilder.ui.rcbs.834600059" name="Resource Custom Build Step">
 							<inputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.inputtype.1275535308" name="Resource Custom Build Step Input Type"/>
 							<outputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.outputtype.1778058661" name="Resource Custom Build Step Output Type" outputNames="xmlcopyeditor_rc.o"/>
 						</tool>
@ -123,24 +120,23 @@
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mingw.exe.release.710071756" moduleId="org.eclipse.cdt.core.settings" name="ReleaseWx28-x86">
 				<macros>
 					<stringMacro name="WXVER" type="VALUE_TEXT" value="28"/>
-					<stringMacro name="BOOSTINC" type="VALUE_TEXT" value="E:/lib/boost_1_72_0"/>
+					<stringMacro name="BOOSTINC" type="VALUE_TEXT" value="E:/lib/boost_1_70_0"/>
 					<stringMacro name="WXWIDGETS" type="VALUE_TEXT" value="E:/wxWidgets-2.8.12"/>
 					<stringMacro name="WX_SETUP" type="VALUE_TEXT" value="E:/wxWidgets-2.8.12/lib/gcc_lib32/mswu"/>
 				</macros>
 				<externalSettings/>
 				<extensions>
-					<extension id="org.eclipse.cdt.core.PE64" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.config.gnu.mingw.exe.release.710071756" name="ReleaseWx28-x86" parent="cdt.managedbuild.config.gnu.mingw.exe.release" postbuildStep="" prebuildStep="">
+				<configuration artifactName="${ProjName}-" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.config.gnu.mingw.exe.release.710071756" name="ReleaseWx28-x86" parent="cdt.managedbuild.config.gnu.mingw.exe.release" postbuildStep="strip -o ${ProjName}.exe ${ProjName}-.exe" prebuildStep="">
 					<folderInfo id="cdt.managedbuild.config.gnu.mingw.exe.release.710071756." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.mingw.exe.release.1386364382" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.exe.release">
 							<targetPlatform id="cdt.managedbuild.target.gnu.platform.mingw.exe.release.1941985969" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.mingw.exe.release"/>
-							<builder buildPath="${workspace_loc:/XmlCopyEditor/Release}" id="cdt.managedbuild.tool.gnu.builder.mingw.base.540651412" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" parallelBuildOn="true" parallelizationNumber="4" superClass="cdt.managedbuild.tool.gnu.builder.mingw.base"/>
+							<builder buildPath="${workspace_loc:/XmlCopyEditor/Release}" id="cdt.managedbuild.tool.gnu.builder.mingw.base.540651412" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" superClass="cdt.managedbuild.tool.gnu.builder.mingw.base"/>
 							<tool id="cdt.managedbuild.tool.gnu.assembler.mingw.exe.release.49927765" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.exe.release">
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1473544019" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
@ -150,10 +146,9 @@
 								<option id="gnu.cpp.compiler.mingw.exe.release.option.debugging.level.1567946828" name="Debug Level" superClass="gnu.cpp.compiler.mingw.exe.release.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.1851942004" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="${BOOSTINC}"/>
 									<listOptionValue builtIn="false" value="${MINGW_HOME}/include/libxml2"/>
 									<listOptionValue builtIn="false" value="${WXWIDGETS}/include"/>
 									<listOptionValue builtIn="false" value="${WXWIDGETS}/contrib/include"/>
-									<listOptionValue builtIn="false" value="${WX_SETUP}"/>
+									<listOptionValue builtIn="false" value="${WXWIDGETS}/lib/gcc_lib64/mswu"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.other.other.1853611325" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -fmessage-length=0" valueType="string"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.preprocessor.def.1550164037" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols">
@ -187,12 +182,11 @@
 									<listOptionValue builtIn="false" value="wxregexu"/>
 									<listOptionValue builtIn="false" value="xslt"/>
 									<listOptionValue builtIn="false" value="xml2"/>
-									<listOptionValue builtIn="false" value="pcre2-8"/>
+									<listOptionValue builtIn="false" value="pcre"/>
 									<listOptionValue builtIn="false" value="xerces-c"/>
 									<listOptionValue builtIn="false" value="curl"/>
 									<listOptionValue builtIn="false" value="aspell"/>
 									<listOptionValue builtIn="false" value="iconv"/>
 									<listOptionValue builtIn="false" value="imm32"/>
 									<listOptionValue builtIn="false" value="kernel32"/>
 									<listOptionValue builtIn="false" value="user32"/>
 									<listOptionValue builtIn="false" value="gdi32"/>
@ -214,7 +208,7 @@
 									<listOptionValue builtIn="false" value="${WXWIDGETS}/lib/gcc_lib64"/>
 								</option>
 								<option id="gnu.cpp.link.option.userobjs.30870315" name="Other objects" superClass="gnu.cpp.link.option.userobjs"/>
-								<option id="gnu.cpp.link.option.flags.1247614174" name="Linker flags" superClass="gnu.cpp.link.option.flags" value="-mwindows -s" valueType="string"/>
+								<option id="gnu.cpp.link.option.flags.1247614174" name="Linker flags" superClass="gnu.cpp.link.option.flags" value="-mwindows" valueType="string"/>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1542313773" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@ -223,7 +217,7 @@
 						</toolChain>
 					</folderInfo>
 					<fileInfo id="cdt.managedbuild.config.gnu.mingw.exe.release.710071756.205300379" name="xmlcopyeditor.rc" rcbsApplicability="override" resourcePath="xmlcopyeditor.rc" toolsToInvoke="org.eclipse.cdt.managedbuilder.ui.rcbs.1002384741">
-						<tool announcement="Invoking: Resource Custom Build Step" command="windres.exe ${RCDEFS} ${RCINCS} -I${WXWIDGETS} -I${WXWIDGETS}/include -I${WX_SETUP} -i ${InputFileRelPath} -Ocoff -o ${OutputFileRelPath}" customBuildStep="true" id="org.eclipse.cdt.managedbuilder.ui.rcbs.1002384741" name="Resource Custom Build Step">
+						<tool announcement="Invoking: Resource Custom Build Step" command="windres.exe ${RCDEFS} ${RCINCS} -I${WXWIDGETS}/include -i ${InputFileRelPath} -Ocoff -o ${OutputFileRelPath}" customBuildStep="true" id="org.eclipse.cdt.managedbuilder.ui.rcbs.1002384741" name="Resource Custom Build Step">
 							<inputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.inputtype.435620893" name="Resource Custom Build Step Input Type"/>
 							<outputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.outputtype.521916258" name="Resource Custom Build Step Output Type" outputNames="xmlcopyeditor_rc.o"/>
 						</tool>
@ -236,13 +230,12 @@
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.2136330833" moduleId="org.eclipse.cdt.core.settings" name="DebugStatic">
 				<macros>
 					<stringMacro name="WXVER" type="VALUE_TEXT" value="31"/>
-					<stringMacro name="BOOSTINC" type="VALUE_TEXT" value="E:/lib/boost_1_72_0"/>
+					<stringMacro name="BOOSTINC" type="VALUE_TEXT" value="E:/lib/boost_1_70_0"/>
 					<stringMacro name="WXWIDGETS" type="VALUE_TEXT" value="E:/wxWidgets"/>
 					<stringMacro name="WX_SETUP" type="VALUE_TEXT" value="E:/wxWidgets/lib/gcc_lib64/mswud"/>
 				</macros>
 				<externalSettings/>
 				<extensions>
-					<extension id="org.eclipse.cdt.core.PE64" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
@ -253,7 +246,7 @@
 					<folderInfo id="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.2136330833." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.mingw.exe.debug.529318072" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.exe.debug">
 							<targetPlatform id="cdt.managedbuild.target.gnu.platform.mingw.exe.debug.182397381" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.mingw.exe.debug"/>
-							<builder buildPath="${workspace_loc:/XmlCopyEditor/DebugStatic}" id="cdt.managedbuild.tool.gnu.builder.mingw.base.1410429609" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" parallelBuildOn="true" parallelizationNumber="4" superClass="cdt.managedbuild.tool.gnu.builder.mingw.base"/>
+							<builder buildPath="${workspace_loc:/XmlCopyEditor/DebugStatic}" id="cdt.managedbuild.tool.gnu.builder.mingw.base.1410429609" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" superClass="cdt.managedbuild.tool.gnu.builder.mingw.base"/>
 							<tool command="as" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" id="cdt.managedbuild.tool.gnu.assembler.mingw.exe.debug.578165645" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.exe.debug">
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1482780224" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
@ -263,17 +256,17 @@
 								<option id="gnu.cpp.compiler.mingw.exe.debug.option.debugging.level.413996427" name="Debug Level" superClass="gnu.cpp.compiler.mingw.exe.debug.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.1178895973" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="${BOOSTINC}"/>
 									<listOptionValue builtIn="false" value="${MINGW_HOME}/include/libxml2"/>
 									<listOptionValue builtIn="false" value="${WXWIDGETS}/include"/>
 									<listOptionValue builtIn="false" value="${WXWIDGETS}/contrib/include"/>
-									<listOptionValue builtIn="false" value="${WX_SETUP}"/>
+									<listOptionValue builtIn="false" value="${WXWIDGETS}/lib/gcc_lib/mswud"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.other.other.215453894" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -fmessage-length=0" valueType="string"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.preprocessor.def.2034622010" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="__WXMSW__"/>
 									<listOptionValue builtIn="false" value="__WXDEBUG__"/>
 									<listOptionValue builtIn="false" value="_UNICODE"/>
-									<listOptionValue builtIn="false" value="PCRE2_STATIC"/>
+									<listOptionValue builtIn="false" value="PCRE_STATIC"/>
 									<listOptionValue builtIn="false" value="LIBXML_STATIC"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.292438275" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
 							</tool>
@ -302,12 +295,11 @@
 									<listOptionValue builtIn="false" value="wxregexud"/>
 									<listOptionValue builtIn="false" value="xslt"/>
 									<listOptionValue builtIn="false" value="xml2"/>
-									<listOptionValue builtIn="false" value="pcre2-8"/>
+									<listOptionValue builtIn="false" value="pcre"/>
 									<listOptionValue builtIn="false" value="xerces-c"/>
 									<listOptionValue builtIn="false" value="curl"/>
 									<listOptionValue builtIn="false" value="aspell"/>
 									<listOptionValue builtIn="false" value="iconv"/>
 									<listOptionValue builtIn="false" value="imm32"/>
 									<listOptionValue builtIn="false" value="kernel32"/>
 									<listOptionValue builtIn="false" value="user32"/>
 									<listOptionValue builtIn="false" value="gdi32"/>
@ -342,7 +334,7 @@
 						</toolChain>
 					</folderInfo>
 					<fileInfo id="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.2136330833.1815160571" name="xmlcopyeditor.rc" rcbsApplicability="override" resourcePath="xmlcopyeditor.rc" toolsToInvoke="org.eclipse.cdt.managedbuilder.ui.rcbs.1286505061">
-						<tool announcement="Invoking: Resource Custom Build Step" command="windres.exe ${RCDEFS} ${RCINCS} -I${WXWIDGETS} -I${WXWIDGETS}/include -I${WX_SETUP} -i ${InputFileRelPath} -Ocoff -o ${OutputFileRelPath}" customBuildStep="true" id="org.eclipse.cdt.managedbuilder.ui.rcbs.1286505061" name="Resource Custom Build Step">
+						<tool announcement="Invoking: Resource Custom Build Step" command="windres.exe ${RCDEFS} ${RCINCS} -I${WXWIDGETS}/include -i ${InputFileRelPath} -Ocoff -o ${OutputFileRelPath}" customBuildStep="true" id="org.eclipse.cdt.managedbuilder.ui.rcbs.1286505061" name="Resource Custom Build Step">
 							<inputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.inputtype.1249410829" name="Resource Custom Build Step Input Type"/>
 							<outputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.outputtype.1580333772" name="Resource Custom Build Step Output Type" outputNames="xmlcopyeditor_rc.o"/>
 						</tool>
@ -355,13 +347,12 @@
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.73095692" moduleId="org.eclipse.cdt.core.settings" name="DebugWx28-x86">
 				<macros>
 					<stringMacro name="WXVER" type="VALUE_TEXT" value="28"/>
-					<stringMacro name="BOOSTINC" type="VALUE_TEXT" value="E:/lib/boost_1_72_0"/>
+					<stringMacro name="BOOSTINC" type="VALUE_TEXT" value="E:/lib/boost_1_70_0"/>
 					<stringMacro name="WXWIDGETS" type="VALUE_TEXT" value="E:/wxWidgets-2.8.12"/>
 					<stringMacro name="WX_SETUP" type="VALUE_TEXT" value="E:/wxWidgets-2.8.12/lib/gcc_dll32/mswud"/>
 				</macros>
 				<externalSettings/>
 				<extensions>
-					<extension id="org.eclipse.cdt.core.PE64" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
@ -372,7 +363,7 @@
 					<folderInfo id="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.73095692." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.mingw.exe.debug.257822489" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.exe.debug">
 							<targetPlatform id="cdt.managedbuild.target.gnu.platform.mingw.exe.debug.1612720961" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.mingw.exe.debug"/>
-							<builder buildPath="${workspace_loc:/XmlCopyEditor}/DebugWx28" id="org.eclipse.cdt.build.core.internal.builder.1337615939" keepEnvironmentInBuildfile="false" name="CDT Internal Builder" parallelBuildOn="true" parallelizationNumber="4" superClass="org.eclipse.cdt.build.core.internal.builder"/>
+							<builder buildPath="${workspace_loc:/XmlCopyEditor}/DebugWx28" id="org.eclipse.cdt.build.core.internal.builder.1337615939" keepEnvironmentInBuildfile="false" name="CDT Internal Builder" superClass="org.eclipse.cdt.build.core.internal.builder"/>
 							<tool command="as" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" id="cdt.managedbuild.tool.gnu.assembler.mingw.exe.debug.825294006" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.exe.debug">
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1486689484" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
@ -382,10 +373,9 @@
 								<option id="gnu.cpp.compiler.mingw.exe.debug.option.debugging.level.563391868" name="Debug Level" superClass="gnu.cpp.compiler.mingw.exe.debug.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.1934118017" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="${BOOSTINC}"/>
 									<listOptionValue builtIn="false" value="${MINGW_HOME}/include/libxml2"/>
 									<listOptionValue builtIn="false" value="${WXWIDGETS}/include"/>
 									<listOptionValue builtIn="false" value="${WXWIDGETS}/contrib/include"/>
-									<listOptionValue builtIn="false" value="${WX_SETUP}"/>
+									<listOptionValue builtIn="false" value="${WXWIDGETS}/lib/gcc_dll32/mswud"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.other.other.1296274158" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 -Wno-unused-local-typedefs" valueType="string"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.preprocessor.def.511915901" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols">
@ -419,12 +409,11 @@
 									<listOptionValue builtIn="false" value="wxregexud"/>
 									<listOptionValue builtIn="false" value="xslt"/>
 									<listOptionValue builtIn="false" value="xml2"/>
-									<listOptionValue builtIn="false" value="pcre2-8"/>
+									<listOptionValue builtIn="false" value="pcre"/>
 									<listOptionValue builtIn="false" value="xerces-c"/>
 									<listOptionValue builtIn="false" value="curl"/>
 									<listOptionValue builtIn="false" value="aspell"/>
 									<listOptionValue builtIn="false" value="iconv"/>
 									<listOptionValue builtIn="false" value="imm32"/>
 									<listOptionValue builtIn="false" value="kernel32"/>
 									<listOptionValue builtIn="false" value="user32"/>
 									<listOptionValue builtIn="false" value="gdi32"/>
@ -455,7 +444,7 @@
 						</toolChain>
 					</folderInfo>
 					<fileInfo id="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.73095692.20277564" name="xmlcopyeditor.rc" rcbsApplicability="override" resourcePath="xmlcopyeditor.rc" toolsToInvoke="org.eclipse.cdt.managedbuilder.ui.rcbs.1845060931">
-						<tool announcement="Invoking: Resource Custom Build Step" command="windres.exe ${RCDEFS} ${RCINCS} -I${WXWIDGETS} -I${WXWIDGETS}/include -I${WX_SETUP} -i ${InputFileRelPath} -Ocoff -o ${OutputFileRelPath}" customBuildStep="true" id="org.eclipse.cdt.managedbuilder.ui.rcbs.1845060931" name="Resource Custom Build Step">
+						<tool announcement="Invoking: Resource Custom Build Step" command="windres.exe ${RCDEFS} ${RCINCS} -I${WXWIDGETS}/include -i ${InputFileRelPath} -Ocoff -o ${OutputFileRelPath}" customBuildStep="true" id="org.eclipse.cdt.managedbuilder.ui.rcbs.1845060931" name="Resource Custom Build Step">
 							<inputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.inputtype.344672552" name="Resource Custom Build Step Input Type"/>
 							<outputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.outputtype.710472742" name="Resource Custom Build Step Output Type" outputNames="xmlcopyeditor_rc.o"/>
 						</tool>
@ -467,25 +456,24 @@
 		<cconfiguration id="cdt.managedbuild.config.gnu.mingw.exe.release.710071756.384493523">
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mingw.exe.release.710071756.384493523" moduleId="org.eclipse.cdt.core.settings" name="ReleaseWx-x86">
 				<macros>
-					<stringMacro name="WXVER" type="VALUE_TEXT" value="3.1"/>
+					<stringMacro name="WXVER" type="VALUE_TEXT" value="31"/>
-					<stringMacro name="BOOSTINC" type="VALUE_TEXT" value="E:/lib/boost_1_72_0"/>
+					<stringMacro name="BOOSTINC" type="VALUE_TEXT" value="E:/lib/boost_1_70_0"/>
-					<stringMacro name="WXWIDGETS" type="VALUE_TEXT" value="${MINGW_HOME}/include/wx-3.1"/>
+					<stringMacro name="WXWIDGETS" type="VALUE_TEXT" value="E:/wxWidgets"/>
 					<stringMacro name="WX_SETUP" type="VALUE_TEXT" value="${MINGW_HOME}/lib/wx/include/msw-unicode-static-3.1"/>
 				</macros>
 				<externalSettings/>
 				<extensions>
-					<extension id="org.eclipse.cdt.core.PE64" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.config.gnu.mingw.exe.release.710071756.384493523" name="ReleaseWx-x86" parent="cdt.managedbuild.config.gnu.mingw.exe.release" postbuildStep="" prebuildStep="">
+				<configuration artifactName="${ProjName}-" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.config.gnu.mingw.exe.release.710071756.384493523" name="ReleaseWx-x86" parent="cdt.managedbuild.config.gnu.mingw.exe.release" postbuildStep="strip -o ${ProjName}.exe ${ProjName}-.exe" prebuildStep="">
 					<folderInfo id="cdt.managedbuild.config.gnu.mingw.exe.release.710071756.384493523." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.mingw.exe.release.1523176033" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.exe.release">
 							<targetPlatform id="cdt.managedbuild.target.gnu.platform.mingw.exe.release.1727143624" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.mingw.exe.release"/>
-							<builder buildPath="${workspace_loc:/XmlCopyEditor/Release}" id="cdt.managedbuild.tool.gnu.builder.mingw.base.930714972" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" parallelBuildOn="true" parallelizationNumber="4" superClass="cdt.managedbuild.tool.gnu.builder.mingw.base"/>
+							<builder buildPath="${workspace_loc:/XmlCopyEditor/Release}" id="cdt.managedbuild.tool.gnu.builder.mingw.base.930714972" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" superClass="cdt.managedbuild.tool.gnu.builder.mingw.base"/>
 							<tool id="cdt.managedbuild.tool.gnu.assembler.mingw.exe.release.1199470674" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.exe.release">
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1405254547" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
@ -495,11 +483,9 @@
 								<option id="gnu.cpp.compiler.mingw.exe.release.option.debugging.level.363888818" name="Debug Level" superClass="gnu.cpp.compiler.mingw.exe.release.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.456227121" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="${BOOSTINC}"/>
 									<listOptionValue builtIn="false" value="${MINGW_HOME}/include/libxml2"/>
 									<listOptionValue builtIn="false" value="${WXWIDGETS}"/>
 									<listOptionValue builtIn="false" value="${WXWIDGETS}/include"/>
 									<listOptionValue builtIn="false" value="${WXWIDGETS}/contrib/include"/>
-									<listOptionValue builtIn="false" value="${WX_SETUP}"/>
+									<listOptionValue builtIn="false" value="${WXWIDGETS}/lib/gcc_lib64/mswu"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.other.other.1613296538" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -fmessage-length=0" valueType="string"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.preprocessor.def.1998253537" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols">
@ -518,29 +504,28 @@
 							<tool id="cdt.managedbuild.tool.gnu.c.linker.mingw.exe.release.51183391" name="MinGW C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.exe.release"/>
 							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.release.196561642" name="MinGW C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.release">
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.link.option.libs.600357943" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
-									<listOptionValue builtIn="false" value=":libwx_mswu_richtext-${WXVER}.a"/>
+									<listOptionValue builtIn="false" value="wxmsw${WXVER}u_richtext"/>
-									<listOptionValue builtIn="false" value=":libwx_mswu_html-${WXVER}.a"/>
+									<listOptionValue builtIn="false" value="wxmsw${WXVER}u_html"/>
-									<listOptionValue builtIn="false" value=":libwx_mswu_aui-${WXVER}.a"/>
+									<listOptionValue builtIn="false" value="wxmsw${WXVER}u_aui"/>
-									<listOptionValue builtIn="false" value=":libwx_mswu_adv-${WXVER}.a"/>
+									<listOptionValue builtIn="false" value="wxmsw${WXVER}u_adv"/>
-									<listOptionValue builtIn="false" value=":libwx_mswu_stc-${WXVER}.a"/>
+									<listOptionValue builtIn="false" value="wxmsw${WXVER}u_stc"/>
-									<listOptionValue builtIn="false" value=":libwx_mswu_core-${WXVER}.a"/>
+									<listOptionValue builtIn="false" value="wxmsw${WXVER}u_core"/>
-									<listOptionValue builtIn="false" value=":libwx_baseu_xml-${WXVER}.a"/>
+									<listOptionValue builtIn="false" value="wxbase${WXVER}u_xml"/>
-									<listOptionValue builtIn="false" value=":libwx_baseu_net-${WXVER}.a"/>
+									<listOptionValue builtIn="false" value="wxbase${WXVER}u_net"/>
-									<listOptionValue builtIn="false" value=":libwx_baseu-${WXVER}.a"/>
+									<listOptionValue builtIn="false" value="wxbase${WXVER}u"/>
-									<listOptionValue builtIn="false" value="wxscintilla-${WXVER}"/>
+									<listOptionValue builtIn="false" value="wxscintilla"/>
-									<listOptionValue builtIn="false" value="wxtiff-${WXVER}"/>
+									<listOptionValue builtIn="false" value="wxtiff"/>
-									<listOptionValue builtIn="false" value="wxjpeg-${WXVER}"/>
+									<listOptionValue builtIn="false" value="wxjpeg"/>
-									<listOptionValue builtIn="false" value="wxpng-${WXVER}"/>
+									<listOptionValue builtIn="false" value="wxpng"/>
-									<listOptionValue builtIn="false" value="wxzlib-${WXVER}"/>
+									<listOptionValue builtIn="false" value="wxzlib"/>
-									<listOptionValue builtIn="false" value="wxregexu-${WXVER}"/>
+									<listOptionValue builtIn="false" value="wxregexu"/>
 									<listOptionValue builtIn="false" value="xslt"/>
 									<listOptionValue builtIn="false" value="xml2"/>
-									<listOptionValue builtIn="false" value="pcre2-8"/>
+									<listOptionValue builtIn="false" value="pcre"/>
 									<listOptionValue builtIn="false" value="xerces-c"/>
 									<listOptionValue builtIn="false" value="curl"/>
 									<listOptionValue builtIn="false" value="aspell"/>
 									<listOptionValue builtIn="false" value="iconv"/>
 									<listOptionValue builtIn="false" value="imm32"/>
 									<listOptionValue builtIn="false" value="kernel32"/>
 									<listOptionValue builtIn="false" value="user32"/>
 									<listOptionValue builtIn="false" value="gdi32"/>
@ -563,10 +548,10 @@
 									<listOptionValue builtIn="false" value="version"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.link.option.paths.1874533391" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
-									<listOptionValue builtIn="false" value="${WXWIDGETS}/lib/gcc_lib32"/>
+									<listOptionValue builtIn="false" value="${WXWIDGETS}/lib/gcc_lib64"/>
 								</option>
 								<option id="gnu.cpp.link.option.userobjs.367914151" name="Other objects" superClass="gnu.cpp.link.option.userobjs"/>
-								<option id="gnu.cpp.link.option.flags.89495341" name="Linker flags" superClass="gnu.cpp.link.option.flags" value="-mwindows -s" valueType="string"/>
+								<option id="gnu.cpp.link.option.flags.89495341" name="Linker flags" superClass="gnu.cpp.link.option.flags" value="-mwindows" valueType="string"/>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.926332437" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@ -575,7 +560,7 @@
 						</toolChain>
 					</folderInfo>
 					<fileInfo id="cdt.managedbuild.config.gnu.mingw.exe.release.710071756.384493523.xmlcopyeditor.rc" name="xmlcopyeditor.rc" rcbsApplicability="override" resourcePath="xmlcopyeditor.rc" toolsToInvoke="org.eclipse.cdt.managedbuilder.ui.rcbs.1002384741.1919204467">
-						<tool announcement="Invoking: Resource Custom Build Step" command="windres.exe ${RCDEFS} ${RCINCS} -I${WXWIDGETS} -I${WXWIDGETS}/include -I${WX_SETUP} -i ${InputFileRelPath} -Ocoff -o ${OutputFileRelPath}" customBuildStep="true" id="org.eclipse.cdt.managedbuilder.ui.rcbs.1002384741.1919204467" name="Resource Custom Build Step">
+						<tool announcement="Invoking: Resource Custom Build Step" command="windres.exe ${RCDEFS} ${RCINCS} -I${WXWIDGETS}/include -i ${InputFileRelPath} -Ocoff -o ${OutputFileRelPath}" customBuildStep="true" id="org.eclipse.cdt.managedbuilder.ui.rcbs.1002384741.1919204467" name="Resource Custom Build Step">
 							<inputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.inputtype.435620893.7517665" name="Resource Custom Build Step Input Type"/>
 							<outputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.outputtype.521916258.1518266369" name="Resource Custom Build Step Output Type" outputNames="xmlcopyeditor_rc.o"/>
 						</tool>
@ -588,13 +573,12 @@
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.1860829555" moduleId="org.eclipse.cdt.core.settings" name="DebugWx-x64">
 				<macros>
 					<stringMacro name="WXVER" type="VALUE_TEXT" value="31"/>
-					<stringMacro name="BOOSTINC" type="VALUE_TEXT" value="E:/lib/boost_1_72_0"/>
+					<stringMacro name="BOOSTINC" type="VALUE_TEXT" value="E:/lib/boost_1_70_0"/>
 					<stringMacro name="WXWIDGETS" type="VALUE_TEXT" value="E:/wxWidgets"/>
 					<stringMacro name="WX_SETUP" type="VALUE_TEXT" value="E:/wxWidgets/lib/gcc_dll64/mswud"/>
 				</macros>
 				<externalSettings/>
 				<extensions>
-					<extension id="org.eclipse.cdt.core.PE64" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
@ -605,7 +589,7 @@
 					<folderInfo id="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.1860829555." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.mingw.exe.debug.545573569" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.exe.debug">
 							<targetPlatform id="cdt.managedbuild.target.gnu.platform.mingw.exe.debug.986539398" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.mingw.exe.debug"/>
-							<builder buildPath="${workspace_loc:/XmlCopyEditor/Debug}" id="cdt.managedbuild.tool.gnu.builder.mingw.base.1668399577" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" parallelBuildOn="true" parallelizationNumber="4" superClass="cdt.managedbuild.tool.gnu.builder.mingw.base"/>
+							<builder buildPath="${workspace_loc:/XmlCopyEditor/Debug}" id="cdt.managedbuild.tool.gnu.builder.mingw.base.1668399577" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" superClass="cdt.managedbuild.tool.gnu.builder.mingw.base"/>
 							<tool command="as" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" id="cdt.managedbuild.tool.gnu.assembler.mingw.exe.debug.1542300750" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.exe.debug">
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1165374143" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
@ -615,11 +599,9 @@
 								<option id="gnu.cpp.compiler.mingw.exe.debug.option.debugging.level.1661238691" name="Debug Level" superClass="gnu.cpp.compiler.mingw.exe.debug.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.1436489844" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="${BOOSTINC}"/>
 									<listOptionValue builtIn="false" value="${MINGW_HOME}/include/libxml2"/>
 									<listOptionValue builtIn="false" value="${WXWIDGETS}"/>
 									<listOptionValue builtIn="false" value="${WXWIDGETS}/include"/>
 									<listOptionValue builtIn="false" value="${WXWIDGETS}/contrib/include"/>
-									<listOptionValue builtIn="false" value="${WX_SETUP}"/>
+									<listOptionValue builtIn="false" value="${WXWIDGETS}/lib/gcc_dll64/mswud"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.other.other.10300771" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -fmessage-length=0" valueType="string"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.preprocessor.def.406862416" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols">
@ -654,12 +636,11 @@
 									<listOptionValue builtIn="false" value="wxregexud"/>
 									<listOptionValue builtIn="false" value="xslt"/>
 									<listOptionValue builtIn="false" value="xml2"/>
-									<listOptionValue builtIn="false" value="pcre2-8"/>
+									<listOptionValue builtIn="false" value="pcre"/>
 									<listOptionValue builtIn="false" value="xerces-c"/>
 									<listOptionValue builtIn="false" value="curl"/>
 									<listOptionValue builtIn="false" value="aspell"/>
 									<listOptionValue builtIn="false" value="iconv"/>
 									<listOptionValue builtIn="false" value="imm32"/>
 									<listOptionValue builtIn="false" value="kernel32"/>
 									<listOptionValue builtIn="false" value="user32"/>
 									<listOptionValue builtIn="false" value="gdi32"/>
@ -694,7 +675,7 @@
 						</toolChain>
 					</folderInfo>
 					<fileInfo id="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.1860829555.xmlcopyeditor.rc" name="xmlcopyeditor.rc" rcbsApplicability="override" resourcePath="xmlcopyeditor.rc" toolsToInvoke="org.eclipse.cdt.managedbuilder.ui.rcbs.834600059.1588710394">
-						<tool command="windres.exe ${RCDEFS} ${RCINCS} -I${WXWIDGETS} -I${WXWIDGETS}/include -I${WX_SETUP} -i ${InputFileRelPath} -Ocoff -o ${OutputFileRelPath}" customBuildStep="true" id="org.eclipse.cdt.managedbuilder.ui.rcbs.834600059.1588710394" name="Resource Custom Build Step">
+						<tool command="windres.exe ${RCDEFS} ${RCINCS} -I${WXWIDGETS}/include -i ${InputFileRelPath} -Ocoff -o ${OutputFileRelPath}" customBuildStep="true" id="org.eclipse.cdt.managedbuilder.ui.rcbs.834600059.1588710394" name="Resource Custom Build Step">
 							<inputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.inputtype.1275535308.1393397672" name="Resource Custom Build Step Input Type"/>
 							<outputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.outputtype.1778058661.2052518297" name="Resource Custom Build Step Output Type" outputNames="xmlcopyeditor_rc.o"/>
 						</tool>
@ -707,24 +688,23 @@
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mingw.exe.release.710071756.1627034107" moduleId="org.eclipse.cdt.core.settings" name="ReleaseWx28-x64">
 				<macros>
 					<stringMacro name="WXVER" type="VALUE_TEXT" value="28"/>
-					<stringMacro name="BOOSTINC" type="VALUE_TEXT" value="E:/lib/boost_1_72_0"/>
+					<stringMacro name="BOOSTINC" type="VALUE_TEXT" value="E:/lib/boost_1_70_0"/>
 					<stringMacro name="WXWIDGETS" type="VALUE_TEXT" value="E:/wxWidgets-2.8.12"/>
 					<stringMacro name="WX_SETUP" type="VALUE_TEXT" value="E:/wxWidgets-2.8.12/lib/gcc_lib64/mswu"/>
 				</macros>
 				<externalSettings/>
 				<extensions>
-					<extension id="org.eclipse.cdt.core.PE64" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.config.gnu.mingw.exe.release.710071756.1627034107" name="ReleaseWx28-x64" parent="cdt.managedbuild.config.gnu.mingw.exe.release" postbuildStep="" prebuildStep="">
+				<configuration artifactName="${ProjName}-" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.config.gnu.mingw.exe.release.710071756.1627034107" name="ReleaseWx28-x64" parent="cdt.managedbuild.config.gnu.mingw.exe.release" postbuildStep="strip -o ${ProjName}.exe ${ProjName}-.exe" prebuildStep="">
 					<folderInfo id="cdt.managedbuild.config.gnu.mingw.exe.release.710071756.1627034107." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.mingw.exe.release.1134942942" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.exe.release">
 							<targetPlatform id="cdt.managedbuild.target.gnu.platform.mingw.exe.release.774622965" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.mingw.exe.release"/>
-							<builder buildPath="${workspace_loc:/XmlCopyEditor/Release}" id="cdt.managedbuild.tool.gnu.builder.mingw.base.1344138799" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" parallelBuildOn="true" parallelizationNumber="4" superClass="cdt.managedbuild.tool.gnu.builder.mingw.base"/>
+							<builder buildPath="${workspace_loc:/XmlCopyEditor/Release}" id="cdt.managedbuild.tool.gnu.builder.mingw.base.1344138799" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" superClass="cdt.managedbuild.tool.gnu.builder.mingw.base"/>
 							<tool id="cdt.managedbuild.tool.gnu.assembler.mingw.exe.release.1701740462" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.exe.release">
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1949659739" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
@ -734,10 +714,9 @@
 								<option id="gnu.cpp.compiler.mingw.exe.release.option.debugging.level.632123797" name="Debug Level" superClass="gnu.cpp.compiler.mingw.exe.release.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.1512722089" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="${BOOSTINC}"/>
 									<listOptionValue builtIn="false" value="${MINGW_HOME}/include/libxml2"/>
 									<listOptionValue builtIn="false" value="${WXWIDGETS}/include"/>
 									<listOptionValue builtIn="false" value="${WXWIDGETS}/contrib/include"/>
-									<listOptionValue builtIn="false" value="${WX_SETUP}"/>
+									<listOptionValue builtIn="false" value="${WXWIDGETS}/lib/gcc_lib64/mswu"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.other.other.824254524" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -fmessage-length=0" valueType="string"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.preprocessor.def.1196350857" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols">
@ -772,12 +751,11 @@
 									<listOptionValue builtIn="false" value="wxregexu"/>
 									<listOptionValue builtIn="false" value="xslt"/>
 									<listOptionValue builtIn="false" value="xml2"/>
-									<listOptionValue builtIn="false" value="pcre2-8"/>
+									<listOptionValue builtIn="false" value="pcre"/>
 									<listOptionValue builtIn="false" value="xerces-c"/>
 									<listOptionValue builtIn="false" value="curl"/>
 									<listOptionValue builtIn="false" value="aspell"/>
 									<listOptionValue builtIn="false" value="iconv"/>
 									<listOptionValue builtIn="false" value="imm32"/>
 									<listOptionValue builtIn="false" value="kernel32"/>
 									<listOptionValue builtIn="false" value="user32"/>
 									<listOptionValue builtIn="false" value="gdi32"/>
@ -799,7 +777,7 @@
 									<listOptionValue builtIn="false" value="${WXWIDGETS}/lib/gcc_lib64"/>
 								</option>
 								<option id="gnu.cpp.link.option.userobjs.350391064" name="Other objects" superClass="gnu.cpp.link.option.userobjs" useByScannerDiscovery="false"/>
-								<option id="gnu.cpp.link.option.flags.25328215" name="Linker flags" superClass="gnu.cpp.link.option.flags" useByScannerDiscovery="false" value="-mwindows -s" valueType="string"/>
+								<option id="gnu.cpp.link.option.flags.25328215" name="Linker flags" superClass="gnu.cpp.link.option.flags" useByScannerDiscovery="false" value="-mwindows" valueType="string"/>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1248188546" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@ -808,7 +786,7 @@
 						</toolChain>
 					</folderInfo>
 					<fileInfo id="cdt.managedbuild.config.gnu.mingw.exe.release.710071756.1627034107.xmlcopyeditor.rc" name="xmlcopyeditor.rc" rcbsApplicability="override" resourcePath="xmlcopyeditor.rc" toolsToInvoke="org.eclipse.cdt.managedbuilder.ui.rcbs.1002384741.949900525">
-						<tool announcement="Invoking: Resource Custom Build Step" command="windres.exe ${RCDEFS} ${RCINCS} -I${WXWIDGETS} -I${WXWIDGETS}/include -I${WX_SETUP} -i ${InputFileRelPath} -Ocoff -o ${OutputFileRelPath}" customBuildStep="true" id="org.eclipse.cdt.managedbuilder.ui.rcbs.1002384741.949900525" name="Resource Custom Build Step">
+						<tool announcement="Invoking: Resource Custom Build Step" command="windres.exe ${RCDEFS} ${RCINCS} -I${WXWIDGETS}/include -i ${InputFileRelPath} -Ocoff -o ${OutputFileRelPath}" customBuildStep="true" id="org.eclipse.cdt.managedbuilder.ui.rcbs.1002384741.949900525" name="Resource Custom Build Step">
 							<inputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.inputtype.435620893.759259479" name="Resource Custom Build Step Input Type"/>
 							<outputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.outputtype.521916258.1180134300" name="Resource Custom Build Step Output Type" outputNames="xmlcopyeditor_rc.o"/>
 						</tool>
@ -821,13 +799,12 @@
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.73095692.895241768" moduleId="org.eclipse.cdt.core.settings" name="DebugWx28-x64">
 				<macros>
 					<stringMacro name="WXVER" type="VALUE_TEXT" value="28"/>
-					<stringMacro name="BOOSTINC" type="VALUE_TEXT" value="E:/lib/boost_1_72_0"/>
+					<stringMacro name="BOOSTINC" type="VALUE_TEXT" value="E:/lib/boost_1_70_0"/>
 					<stringMacro name="WXWIDGETS" type="VALUE_TEXT" value="E:/wxWidgets-2.8.12"/>
 					<stringMacro name="WX_SETUP" type="VALUE_TEXT" value="E:/wxWidgets-2.8.12/lib/gcc_dll64/mswud"/>
 				</macros>
 				<externalSettings/>
 				<extensions>
-					<extension id="org.eclipse.cdt.core.PE64" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
@ -838,7 +815,7 @@
 					<folderInfo id="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.73095692.895241768." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.mingw.exe.debug.1611188359" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.exe.debug">
 							<targetPlatform id="cdt.managedbuild.target.gnu.platform.mingw.exe.debug.1787279016" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.mingw.exe.debug"/>
-							<builder buildPath="${workspace_loc:/XmlCopyEditor}/DebugWx28" id="org.eclipse.cdt.build.core.internal.builder.69397929" keepEnvironmentInBuildfile="false" name="CDT Internal Builder" parallelBuildOn="true" parallelizationNumber="4" superClass="org.eclipse.cdt.build.core.internal.builder"/>
+							<builder buildPath="${workspace_loc:/XmlCopyEditor}/DebugWx28" id="org.eclipse.cdt.build.core.internal.builder.69397929" keepEnvironmentInBuildfile="false" name="CDT Internal Builder" superClass="org.eclipse.cdt.build.core.internal.builder"/>
 							<tool command="as" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" id="cdt.managedbuild.tool.gnu.assembler.mingw.exe.debug.1192342080" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.exe.debug">
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.364127211" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
@ -848,10 +825,9 @@
 								<option id="gnu.cpp.compiler.mingw.exe.debug.option.debugging.level.977322640" name="Debug Level" superClass="gnu.cpp.compiler.mingw.exe.debug.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.1796312879" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="${BOOSTINC}"/>
 									<listOptionValue builtIn="false" value="${MINGW_HOME}/include/libxml2"/>
 									<listOptionValue builtIn="false" value="${WXWIDGETS}/include"/>
 									<listOptionValue builtIn="false" value="${WXWIDGETS}/contrib/include"/>
-									<listOptionValue builtIn="false" value="${WX_SETUP}"/>
+									<listOptionValue builtIn="false" value="${WXWIDGETS}/lib/gcc_dll64/mswud"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.other.other.273333438" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 -Wno-unused-local-typedefs" valueType="string"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.preprocessor.def.1297621113" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols">
@ -885,12 +861,11 @@
 									<listOptionValue builtIn="false" value="wxregexud"/>
 									<listOptionValue builtIn="false" value="xslt"/>
 									<listOptionValue builtIn="false" value="xml2"/>
-									<listOptionValue builtIn="false" value="pcre2-8"/>
+									<listOptionValue builtIn="false" value="pcre"/>
 									<listOptionValue builtIn="false" value="xerces-c"/>
 									<listOptionValue builtIn="false" value="curl"/>
 									<listOptionValue builtIn="false" value="aspell"/>
 									<listOptionValue builtIn="false" value="iconv"/>
 									<listOptionValue builtIn="false" value="imm32"/>
 									<listOptionValue builtIn="false" value="kernel32"/>
 									<listOptionValue builtIn="false" value="user32"/>
 									<listOptionValue builtIn="false" value="gdi32"/>
@ -921,7 +896,7 @@
 						</toolChain>
 					</folderInfo>
 					<fileInfo id="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.73095692.895241768.xmlcopyeditor.rc" name="xmlcopyeditor.rc" rcbsApplicability="override" resourcePath="xmlcopyeditor.rc" toolsToInvoke="org.eclipse.cdt.managedbuilder.ui.rcbs.1845060931.222698201">
-						<tool announcement="Invoking: Resource Custom Build Step" command="windres.exe ${RCDEFS} ${RCINCS} -I${WXWIDGETS} -I${WXWIDGETS}/include -I${WX_SETUP} -i ${InputFileRelPath} -Ocoff -o ${OutputFileRelPath}" customBuildStep="true" id="org.eclipse.cdt.managedbuilder.ui.rcbs.1845060931.222698201" name="Resource Custom Build Step">
+						<tool announcement="Invoking: Resource Custom Build Step" command="windres.exe ${RCDEFS} ${RCINCS} -I${WXWIDGETS}/include -i ${InputFileRelPath} -Ocoff -o ${OutputFileRelPath}" customBuildStep="true" id="org.eclipse.cdt.managedbuilder.ui.rcbs.1845060931.222698201" name="Resource Custom Build Step">
 							<inputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.inputtype.344672552.572784530" name="Resource Custom Build Step Input Type"/>
 							<outputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.outputtype.710472742.1826150231" name="Resource Custom Build Step Output Type" outputNames="xmlcopyeditor_rc.o"/>
 						</tool>
@ -933,10 +908,9 @@
 		<cconfiguration id="cdt.managedbuild.config.gnu.mingw.exe.release.710071756.384493523.2075568512">
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mingw.exe.release.710071756.384493523.2075568512" moduleId="org.eclipse.cdt.core.settings" name="ReleaseWx-x64">
 				<macros>
-					<stringMacro name="WXVER" type="VALUE_TEXT" value="3.1"/>
+					<stringMacro name="WXVER" type="VALUE_TEXT" value="31"/>
-					<stringMacro name="BOOSTINC" type="VALUE_TEXT" value="${MINGW_HOME}/include"/>
+					<stringMacro name="BOOSTINC" type="VALUE_TEXT" value="E:/lib/boost_1_70_0"/>
-					<stringMacro name="WXWIDGETS" type="VALUE_TEXT" value="${MINGW_HOME}/include/wx-3.1"/>
+					<stringMacro name="WXWIDGETS" type="VALUE_TEXT" value="E:/wxWidgets"/>
 					<stringMacro name="WX_SETUP" type="VALUE_TEXT" value="${MINGW_HOME}/lib/wx/include/msw-unicode-static-3.1"/>
 				</macros>
 				<externalSettings/>
 				<extensions>
@ -947,11 +921,11 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.config.gnu.mingw.exe.release.710071756.384493523.2075568512" name="ReleaseWx-x64" parent="cdt.managedbuild.config.gnu.mingw.exe.release" postbuildStep="" prebuildStep="">
+				<configuration artifactName="${ProjName}-" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.config.gnu.mingw.exe.release.710071756.384493523.2075568512" name="ReleaseWx-x64" parent="cdt.managedbuild.config.gnu.mingw.exe.release" postbuildStep="strip -o ${ProjName}.exe ${ProjName}-.exe" prebuildStep="">
 					<folderInfo id="cdt.managedbuild.config.gnu.mingw.exe.release.710071756.384493523.2075568512." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.mingw.exe.release.1887368198" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.exe.release">
 							<targetPlatform binaryParser="org.eclipse.cdt.core.PE" id="cdt.managedbuild.target.gnu.platform.mingw.exe.release.1472743801" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.mingw.exe.release"/>
-							<builder buildPath="${workspace_loc:/XmlCopyEditor/Release}" id="cdt.managedbuild.tool.gnu.builder.mingw.base.558902390" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" parallelBuildOn="true" parallelizationNumber="4" superClass="cdt.managedbuild.tool.gnu.builder.mingw.base"/>
+							<builder buildPath="${workspace_loc:/XmlCopyEditor/Release}" id="cdt.managedbuild.tool.gnu.builder.mingw.base.558902390" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" superClass="cdt.managedbuild.tool.gnu.builder.mingw.base"/>
 							<tool id="cdt.managedbuild.tool.gnu.assembler.mingw.exe.release.29817221" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.exe.release">
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.465903700" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
@ -961,11 +935,9 @@
 								<option id="gnu.cpp.compiler.mingw.exe.release.option.debugging.level.1696315543" name="Debug Level" superClass="gnu.cpp.compiler.mingw.exe.release.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.1865470924" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="${BOOSTINC}"/>
 									<listOptionValue builtIn="false" value="${MINGW_HOME}/include/libxml2"/>
 									<listOptionValue builtIn="false" value="${WXWIDGETS}"/>
 									<listOptionValue builtIn="false" value="${WXWIDGETS}/include"/>
 									<listOptionValue builtIn="false" value="${WXWIDGETS}/contrib/include"/>
-									<listOptionValue builtIn="false" value="${WX_SETUP}"/>
+									<listOptionValue builtIn="false" value="${WXWIDGETS}/lib/gcc_lib64/mswu"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.other.other.961521475" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -fmessage-length=0" valueType="string"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.preprocessor.def.253012043" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols">
@ -983,30 +955,29 @@
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.c.linker.mingw.exe.release.367480360" name="MinGW C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.exe.release"/>
 							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.release.647122531" name="MinGW C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.release">
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.link.option.libs.1817279920" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" useByScannerDiscovery="false" valueType="libs">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.link.option.libs.1817279920" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
-									<listOptionValue builtIn="false" value=":libwx_mswu_richtext-${WXVER}.a"/>
+									<listOptionValue builtIn="false" value="wxmsw${WXVER}u_richtext"/>
-									<listOptionValue builtIn="false" value=":libwx_mswu_html-${WXVER}.a"/>
+									<listOptionValue builtIn="false" value="wxmsw${WXVER}u_html"/>
-									<listOptionValue builtIn="false" value=":libwx_mswu_aui-${WXVER}.a"/>
+									<listOptionValue builtIn="false" value="wxmsw${WXVER}u_aui"/>
-									<listOptionValue builtIn="false" value=":libwx_mswu_adv-${WXVER}.a"/>
+									<listOptionValue builtIn="false" value="wxmsw${WXVER}u_adv"/>
-									<listOptionValue builtIn="false" value=":libwx_mswu_stc-${WXVER}.a"/>
+									<listOptionValue builtIn="false" value="wxmsw${WXVER}u_stc"/>
-									<listOptionValue builtIn="false" value=":libwx_mswu_core-${WXVER}.a"/>
+									<listOptionValue builtIn="false" value="wxmsw${WXVER}u_core"/>
-									<listOptionValue builtIn="false" value=":libwx_baseu_xml-${WXVER}.a"/>
+									<listOptionValue builtIn="false" value="wxbase${WXVER}u_xml"/>
-									<listOptionValue builtIn="false" value=":libwx_baseu_net-${WXVER}.a"/>
+									<listOptionValue builtIn="false" value="wxbase${WXVER}u_net"/>
-									<listOptionValue builtIn="false" value=":libwx_baseu-${WXVER}.a"/>
+									<listOptionValue builtIn="false" value="wxbase${WXVER}u"/>
-									<listOptionValue builtIn="false" value="wxscintilla-${WXVER}"/>
+									<listOptionValue builtIn="false" value="wxscintilla"/>
-									<listOptionValue builtIn="false" value="wxtiff-${WXVER}"/>
+									<listOptionValue builtIn="false" value="wxtiff"/>
-									<listOptionValue builtIn="false" value="wxjpeg-${WXVER}"/>
+									<listOptionValue builtIn="false" value="wxjpeg"/>
-									<listOptionValue builtIn="false" value="wxpng-${WXVER}"/>
+									<listOptionValue builtIn="false" value="wxpng"/>
-									<listOptionValue builtIn="false" value="wxzlib-${WXVER}"/>
+									<listOptionValue builtIn="false" value="wxzlib"/>
-									<listOptionValue builtIn="false" value="wxregexu-${WXVER}"/>
+									<listOptionValue builtIn="false" value="wxregexu"/>
 									<listOptionValue builtIn="false" value="xslt"/>
 									<listOptionValue builtIn="false" value="xml2"/>
-									<listOptionValue builtIn="false" value="pcre2-8"/>
+									<listOptionValue builtIn="false" value="pcre"/>
 									<listOptionValue builtIn="false" value="xerces-c"/>
 									<listOptionValue builtIn="false" value="curl"/>
 									<listOptionValue builtIn="false" value="aspell"/>
 									<listOptionValue builtIn="false" value="iconv"/>
 									<listOptionValue builtIn="false" value="imm32"/>
 									<listOptionValue builtIn="false" value="kernel32"/>
 									<listOptionValue builtIn="false" value="user32"/>
 									<listOptionValue builtIn="false" value="gdi32"/>
@ -1028,11 +999,11 @@
 									<listOptionValue builtIn="false" value="uxtheme"/>
 									<listOptionValue builtIn="false" value="version"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.link.option.paths.603574797" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" useByScannerDiscovery="false" valueType="libPaths">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.link.option.paths.603574797" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
-									<listOptionValue builtIn="false" value=""/>
+									<listOptionValue builtIn="false" value="${WXWIDGETS}/lib/gcc_lib64"/>
 								</option>
-								<option id="gnu.cpp.link.option.userobjs.757025701" name="Other objects" superClass="gnu.cpp.link.option.userobjs" useByScannerDiscovery="false"/>
+								<option id="gnu.cpp.link.option.userobjs.757025701" name="Other objects" superClass="gnu.cpp.link.option.userobjs"/>
-								<option id="gnu.cpp.link.option.flags.811260943" name="Linker flags" superClass="gnu.cpp.link.option.flags" useByScannerDiscovery="false" value="-mwindows -s" valueType="string"/>
+								<option id="gnu.cpp.link.option.flags.811260943" name="Linker flags" superClass="gnu.cpp.link.option.flags" value="-mwindows" valueType="string"/>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1346695762" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@ -1041,7 +1012,7 @@
 						</toolChain>
 					</folderInfo>
 					<fileInfo id="cdt.managedbuild.config.gnu.mingw.exe.release.710071756.384493523.2075568512.xmlcopyeditor.rc" name="xmlcopyeditor.rc" rcbsApplicability="override" resourcePath="xmlcopyeditor.rc" toolsToInvoke="org.eclipse.cdt.managedbuilder.ui.rcbs.1002384741.1919204467.2044059388">
-						<tool announcement="Invoking: Resource Custom Build Step" command="windres.exe ${RCDEFS} ${RCINCS} -I${WXWIDGETS} -I${WXWIDGETS}/include -I${WX_SETUP} -i ${InputFileRelPath} -Ocoff -o ${OutputFileRelPath}" customBuildStep="true" id="org.eclipse.cdt.managedbuilder.ui.rcbs.1002384741.1919204467.2044059388" name="Resource Custom Build Step">
+						<tool announcement="Invoking: Resource Custom Build Step" command="windres.exe ${RCDEFS} ${RCINCS} -I${WXWIDGETS}/include -i ${InputFileRelPath} -Ocoff -o ${OutputFileRelPath}" customBuildStep="true" id="org.eclipse.cdt.managedbuilder.ui.rcbs.1002384741.1919204467.2044059388" name="Resource Custom Build Step">
 							<inputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.inputtype.435620893.7517665.644173098" name="Resource Custom Build Step Input Type"/>
 							<outputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.outputtype.521916258.1518266369.912288502" name="Resource Custom Build Step Output Type" outputNames="xmlcopyeditor_rc.o"/>
 						</tool>
@ -1050,124 +1021,6 @@
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
 		<cconfiguration id="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.1860829555.157862900">
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.1860829555.157862900" moduleId="org.eclipse.cdt.core.settings" name="DebugWx-Linux">
 				<macros>
 					<stringMacro name="WXVER" type="VALUE_TEXT" value="3.0"/>
 					<stringMacro name="BOOSTINC" type="VALUE_TEXT" value="E:/lib/boost_1_72_0"/>
 					<stringMacro name="WXWIDGETS" type="VALUE_TEXT" value="/usr/include/wx-3.0"/>
 					<stringMacro name="WX_SETUP" type="VALUE_TEXT" value="/usr/lib/x86_64-linux-gnu/wx/include/gtk3-unicode-3.0"/>
 				</macros>
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 				<configuration artifactName="xmlcopyeditor" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.1860829555.157862900" name="DebugWx-Linux" parent="cdt.managedbuild.config.gnu.mingw.exe.debug" prebuildStep="">
 					<folderInfo id="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.1860829555.157862900." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.base.295382499" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.base">
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.GNU_ELF" id="cdt.managedbuild.target.gnu.platform.base.872917410" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/>
 							<builder buildPath="${workspace_loc:/XmlCopyEditor}/DebugWx-x64" id="cdt.managedbuild.target.gnu.builder.base.290198114" keepEnvironmentInBuildfile="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="4" superClass="cdt.managedbuild.target.gnu.builder.base"/>
 							<tool id="cdt.managedbuild.tool.gnu.archiver.base.462801893" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
 							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.2032888647" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.167497499" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="${WXWIDGETS}"/>
 									<listOptionValue builtIn="false" value="${WX_SETUP}"/>
 									<listOptionValue builtIn="false" value="/usr/include/libxml2"/>
 									<listOptionValue builtIn="false" value="/usr/include/gtk-3.0"/>
 									<listOptionValue builtIn="false" value="/usr/include/glib-2.0"/>
 									<listOptionValue builtIn="false" value="/usr/include/pango-1.0"/>
 									<listOptionValue builtIn="false" value="/usr/include/fribidi"/>
 									<listOptionValue builtIn="false" value="/usr/include/cairo"/>
 									<listOptionValue builtIn="false" value="/usr/include/pixman-1"/>
 									<listOptionValue builtIn="false" value="/usr/include/uuid"/>
 									<listOptionValue builtIn="false" value="/usr/include/freetype2"/>
 									<listOptionValue builtIn="false" value="/usr/include/libpng16"/>
 									<listOptionValue builtIn="false" value="/usr/include/harfbuzz"/>
 									<listOptionValue builtIn="false" value="/usr/include/glib-2.0"/>
 									<listOptionValue builtIn="false" value="/usr/lib/x86_64-linux-gnu/glib-2.0/include"/>
 									<listOptionValue builtIn="false" value="/usr/include/gdk-pixbuf-2.0"/>
 									<listOptionValue builtIn="false" value="/usr/include/atk-1.0"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.preprocessor.def.1568818715" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="__WXDEBUG__"/>
 									<listOptionValue builtIn="false" value="_UNICODE"/>
 									<listOptionValue builtIn="false" value="_FILE_OFFSET_BITS=64"/>
 									<listOptionValue builtIn="false" value="WXUSINGDLL"/>
 									<listOptionValue builtIn="false" value="__WXGTK__"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.optimization.level.1140419729" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
 								<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="gnu.cpp.compiler.option.debugging.level.967307908" name="Debug Level" superClass="gnu.cpp.compiler.option.debugging.level" useByScannerDiscovery="false" valueType="enumerated"/>
 								<option id="gnu.cpp.compiler.option.dialect.std.1079817902" name="Language standard" superClass="gnu.cpp.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.cpp.compiler.dialect.default" valueType="enumerated"/>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.850787058" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.c.compiler.base.1576068203" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
 								<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.option.optimization.level.1903092473" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
 								<option defaultValue="gnu.c.debugging.level.max" id="gnu.c.compiler.option.debugging.level.419150214" name="Debug Level" superClass="gnu.c.compiler.option.debugging.level" useByScannerDiscovery="false" valueType="enumerated"/>
 								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1157916130" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.c.linker.base.54805592" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base"/>
 							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.345525417" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base">
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.link.option.libs.1611962448" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
 									<listOptionValue builtIn="false" value="wx_gtk3u_richtext-${WXVER}"/>
 									<listOptionValue builtIn="false" value="wx_gtk3u_html-${WXVER}"/>
 									<listOptionValue builtIn="false" value="wx_gtk3u_aui-${WXVER}"/>
 									<listOptionValue builtIn="false" value="wx_gtk3u_adv-${WXVER}"/>
 									<listOptionValue builtIn="false" value="wx_gtk3u_stc-${WXVER}"/>
 									<listOptionValue builtIn="false" value="wx_gtk3u_core-${WXVER}"/>
 									<listOptionValue builtIn="false" value="wx_baseu_xml-${WXVER}"/>
 									<listOptionValue builtIn="false" value="wx_baseu_net-${WXVER}"/>
 									<listOptionValue builtIn="false" value="wx_baseu-${WXVER}"/>
 									<listOptionValue builtIn="false" value="xslt"/>
 									<listOptionValue builtIn="false" value="xml2"/>
 									<listOptionValue builtIn="false" value="pcre2-8"/>
 									<listOptionValue builtIn="false" value="xerces-c"/>
 									<listOptionValue builtIn="false" value="curl"/>
 									<listOptionValue builtIn="false" value="aspell"/>
 									<listOptionValue builtIn="false" value="expat"/>
 									<listOptionValue builtIn="false" value="gtk-3"/>
 									<listOptionValue builtIn="false" value="gdk-3"/>
 									<listOptionValue builtIn="false" value="pangocairo-1.0"/>
 									<listOptionValue builtIn="false" value="pango-1.0"/>
 									<listOptionValue builtIn="false" value="harfbuzz"/>
 									<listOptionValue builtIn="false" value="atk-1.0"/>
 									<listOptionValue builtIn="false" value="cairo-gobject"/>
 									<listOptionValue builtIn="false" value="cairo"/>
 									<listOptionValue builtIn="false" value="gdk_pixbuf-2.0"/>
 									<listOptionValue builtIn="false" value="gio-2.0"/>
 									<listOptionValue builtIn="false" value="gobject-2.0"/>
 									<listOptionValue builtIn="false" value="glib-2.0"/>
 									<listOptionValue builtIn="false" value="pthread"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.link.option.paths.2146776286" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
 									<listOptionValue builtIn="false" value="/usr/lib/x86_64-linux-gnu"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.56066565" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.assembler.base.2042080604" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base">
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.386721795" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
 						</toolChain>
 					</folderInfo>
 					<fileInfo id="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.1860829555.157862900.xmlcopyeditor.rc" name="xmlcopyeditor.rc" rcbsApplicability="disable" resourcePath="xmlcopyeditor.rc" toolsToInvoke="">
 						<tool command="windres.exe ${RCDEFS} ${RCINCS} -I${WXWIDGETS} -I${WXWIDGETS}/include -I${WX_SETUP} -i ${InputFileRelPath} -Ocoff -o ${OutputFileRelPath}" customBuildStep="true" id="org.eclipse.cdt.managedbuilder.ui.rcbs.834600059.1588710394.818976716" name="Resource Custom Build Step">
 							<inputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.inputtype.1275535308.1393397672.847569869" name="Resource Custom Build Step Input Type"/>
 							<outputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.outputtype.1778058661.2052518297.940104188" name="Resource Custom Build Step Output Type" outputNames="xmlcopyeditor_rc.o"/>
 						</tool>
 					</fileInfo>
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
 	</storageModule>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 		<project id="XmlCopyEditor.cdt.managedbuild.target.gnu.mingw.exe.2139504035" name="Executable" projectType="cdt.managedbuild.target.gnu.mingw.exe"/>
@ -1175,61 +1028,58 @@
 	<storageModule moduleId="refreshScope" versionNumber="2">
 		<configuration configurationName="DebugWx-x86"/>
 		<configuration configurationName="DebugWx-x64"/>
 		<configuration configurationName="ReleaseWx"/>
 		<configuration configurationName="ReleaseWx-x86"/>
 		<configuration configurationName="ReleaseWx-x64"/>
 		<configuration configurationName="DebugStatic"/>
-		<configuration configurationName="DebugWx28-x86"/>
+		<configuration configurationName="DebugWx"/>
-		<configuration configurationName="DebugWx28-x64"/>
+		<configuration configurationName="ReleaseWx28"/>
 		<configuration configurationName="ReleaseWx28-x86"/>
 		<configuration configurationName="ReleaseWx28-x64"/>
-		<configuration configurationName="DebugWx-Linux"/>
+		<configuration configurationName="DebugWx28"/>
 		<configuration configurationName="DebugWx28-x86"/>
 		<configuration configurationName="DebugWx28-x64"/>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
 	<storageModule moduleId="scannerConfiguration">
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.release.575104523;cdt.managedbuild.config.gnu.mingw.exe.release.575104523.;cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.release.1937852367;cdt.managedbuild.tool.gnu.c.compiler.input.665335209">
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.73095692;cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.73095692.;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.debug.1283611323;cdt.managedbuild.tool.gnu.cpp.compiler.input.30048819">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
 		</scannerConfigBuildInfo>
 		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.release.575104523;cdt.managedbuild.config.gnu.mingw.exe.release.575104523.;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.release.191196172;cdt.managedbuild.tool.gnu.cpp.compiler.input.419742796">
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
 		</scannerConfigBuildInfo>
 		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.release.710071756;cdt.managedbuild.config.gnu.mingw.exe.release.710071756.;cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.release.13558936;cdt.managedbuild.tool.gnu.c.compiler.input.1117697168">
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
 		</scannerConfigBuildInfo>
 		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.1860829555.157862900;cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.1860829555.157862900.;cdt.managedbuild.tool.gnu.cpp.compiler.base.2032888647;cdt.managedbuild.tool.gnu.cpp.compiler.input.850787058">
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
 		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716;cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.;cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.debug.41071266;cdt.managedbuild.tool.gnu.c.compiler.input.1588932778">
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
 		</scannerConfigBuildInfo>
 		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.release.710071756;cdt.managedbuild.config.gnu.mingw.exe.release.710071756.;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.release.82491729;cdt.managedbuild.tool.gnu.cpp.compiler.input.2060215918">
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
 		</scannerConfigBuildInfo>
 		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.debug.642144985;cdt.managedbuild.config.gnu.mingw.exe.debug.642144985.;cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.debug.1552758885;cdt.managedbuild.tool.gnu.c.compiler.input.1174720994">
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
 		</scannerConfigBuildInfo>
 		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.73095692;cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.73095692.;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.debug.1283611323;cdt.managedbuild.tool.gnu.cpp.compiler.input.30048819">
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
 		</scannerConfigBuildInfo>
 		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.debug.642144985;cdt.managedbuild.config.gnu.mingw.exe.debug.642144985.;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.debug.1091730963;cdt.managedbuild.tool.gnu.cpp.compiler.input.1451406980">
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
 		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.2136330833;cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.2136330833.;cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.debug.1562145307;cdt.managedbuild.tool.gnu.c.compiler.input.1139278329">
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716;cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.debug.456794311;cdt.managedbuild.tool.gnu.cpp.compiler.input.661812090">
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
 		</scannerConfigBuildInfo>
 		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.release.575104523;cdt.managedbuild.config.gnu.mingw.exe.release.575104523.;cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.release.1937852367;cdt.managedbuild.tool.gnu.c.compiler.input.665335209">
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
 		</scannerConfigBuildInfo>
 		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.73095692;cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.73095692.;cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.debug.1315213804;cdt.managedbuild.tool.gnu.c.compiler.input.1291353777">
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
 		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716;cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.debug.456794311;cdt.managedbuild.tool.gnu.cpp.compiler.input.661812090">
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716;cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.;cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.debug.41071266;cdt.managedbuild.tool.gnu.c.compiler.input.1588932778">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
 		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.1860829555.157862900;cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.1860829555.157862900.;cdt.managedbuild.tool.gnu.c.compiler.base.1576068203;cdt.managedbuild.tool.gnu.c.compiler.input.1157916130">
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.2136330833;cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.2136330833.;cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.debug.1562145307;cdt.managedbuild.tool.gnu.c.compiler.input.1139278329">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
 		</scannerConfigBuildInfo>
 		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.2136330833;cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.2136330833.;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.debug.125290081;cdt.managedbuild.tool.gnu.cpp.compiler.input.292438275">
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
 		</scannerConfigBuildInfo>
 		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.release.710071756;cdt.managedbuild.config.gnu.mingw.exe.release.710071756.;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.release.82491729;cdt.managedbuild.tool.gnu.cpp.compiler.input.2060215918">
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
 		</scannerConfigBuildInfo>
 		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.release.710071756;cdt.managedbuild.config.gnu.mingw.exe.release.710071756.;cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.release.13558936;cdt.managedbuild.tool.gnu.c.compiler.input.1117697168">
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
 		</scannerConfigBuildInfo>
 		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.debug.642144985;cdt.managedbuild.config.gnu.mingw.exe.debug.642144985.;cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.debug.1552758885;cdt.managedbuild.tool.gnu.c.compiler.input.1174720994">
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
 		</scannerConfigBuildInfo>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
 </cproject>
--- a/src/.settings/language.settings.xml
+++ b/src/.settings/language.settings.xml
@ -0,0 +1,102 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project>
 	<configuration id="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716" name="DebugWx-x86">
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider class="org.eclipse.cdt.managedbuilder.internal.language.settings.providers.GCCBuiltinSpecsDetectorMinGW" console="false" env-hash="117438947141835845" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorMinGW" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings MinGW" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
 		</extension>
 	</configuration>
 	<configuration id="cdt.managedbuild.config.gnu.mingw.exe.release.710071756" name="ReleaseWx28-x86">
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider class="org.eclipse.cdt.managedbuilder.internal.language.settings.providers.GCCBuiltinSpecsDetectorMinGW" console="false" env-hash="117438947141835845" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorMinGW" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings MinGW" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
 		</extension>
 	</configuration>
 	<configuration id="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.2136330833" name="DebugStatic">
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider class="org.eclipse.cdt.managedbuilder.internal.language.settings.providers.GCCBuiltinSpecsDetectorMinGW" console="false" env-hash="471972272000152517" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorMinGW" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings MinGW" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
 		</extension>
 	</configuration>
 	<configuration id="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.73095692" name="DebugWx28-x86">
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider class="org.eclipse.cdt.managedbuilder.internal.language.settings.providers.GCCBuiltinSpecsDetectorMinGW" console="false" env-hash="117438947141835845" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorMinGW" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings MinGW" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
 		</extension>
 	</configuration>
 	<configuration id="cdt.managedbuild.config.gnu.mingw.exe.release.710071756.384493523" name="ReleaseWx-x86">
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider class="org.eclipse.cdt.managedbuilder.internal.language.settings.providers.GCCBuiltinSpecsDetectorMinGW" console="false" env-hash="117438947141835845" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorMinGW" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings MinGW" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
 		</extension>
 	</configuration>
 	<configuration id="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.1860829555" name="DebugWx-x64">
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider class="org.eclipse.cdt.managedbuilder.internal.language.settings.providers.GCCBuiltinSpecsDetectorMinGW" console="false" env-hash="13086988804560677" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorMinGW" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings MinGW" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
 		</extension>
 	</configuration>
 	<configuration id="cdt.managedbuild.config.gnu.mingw.exe.release.710071756.1627034107" name="ReleaseWx28-x64">
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider class="org.eclipse.cdt.managedbuilder.internal.language.settings.providers.GCCBuiltinSpecsDetectorMinGW" console="false" env-hash="-1549485394940081120" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorMinGW" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings MinGW" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
 		</extension>
 	</configuration>
 	<configuration id="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.73095692.895241768" name="DebugWx28-x64">
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider class="org.eclipse.cdt.managedbuilder.internal.language.settings.providers.GCCBuiltinSpecsDetectorMinGW" console="false" env-hash="-1549485394940081120" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorMinGW" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings MinGW" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
 		</extension>
 	</configuration>
 	<configuration id="cdt.managedbuild.config.gnu.mingw.exe.release.710071756.384493523.2075568512" name="ReleaseWx-x64">
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider class="org.eclipse.cdt.managedbuilder.internal.language.settings.providers.GCCBuiltinSpecsDetectorMinGW" console="false" env-hash="-1549485394940081120" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorMinGW" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings MinGW" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
 		</extension>
 	</configuration>
 </project>
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -9,8 +9,8 @@ noinst_HEADERS = $(srcdir)/*.h
 bin_PROGRAMS = xmlcopyeditor
 bindir = ${prefix}/bin
 xmlcopyeditordir = ${prefix}/share/xmlcopyeditor
-pixmapdir = ${prefix}/share/pixmaps
+pixmapdir = /usr/share/pixmaps
-applicationsdir = ${prefix}/share/applications
+applicationsdir = /usr/share/applications
 # the application source, library search path, and link libraries
 xmlcopyeditor_SOURCES = aboutdialog.cpp \
@ -82,9 +82,7 @@ xmlcopyeditor_LDADD = $(WX_LIBS) \
 	$(ASPELL_LIBS) \
 	$(ENCHANT_LIBS) \
 	$(GTK_LIBS) \
-	$(XSLT_LIBS) \
+	-lexpat -lxslt -lxml2 -lpcre -lxerces-c
 	$(PCRE2_LIBS) \
 	-lexpat -lxerces-c
 nobase_dist_xmlcopyeditor_DATA = $(srcdir)/catalog/catalog \
 	$(srcdir)/dtd/*.* \
@ -134,5 +132,5 @@ EXTRA_DIST = \
 	$(srcdir)/xmlcopyeditor.rc \
 	$(srcdir)/xmlschemaparser.cpp
-AM_CPPFLAGS = $(XML2_CFLAGS) $(ENCHANT_CFLAGS) $(GTK_CFLAGS) $(PCRE2_CFLAGS)
+AM_CPPFLAGS = -I/usr/include/libxml2 $(ENCHANT_CFLAGS) $(GTK_CFLAGS)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -93,11 +93,10 @@ host_triplet = @host@
 bin_PROGRAMS = xmlcopyeditor$(EXEEXT)
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(nobase_dist_xmlcopyeditor_DATA) \
@ -140,7 +139,6 @@ am_xmlcopyeditor_OBJECTS = aboutdialog.$(OBJEXT) \
 xmlcopyeditor_OBJECTS = $(am_xmlcopyeditor_OBJECTS)
 am__DEPENDENCIES_1 =
 xmlcopyeditor_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
@ -161,41 +159,7 @@ am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__maybe_remake_depfiles = depfiles
+am__depfiles_maybe = depfiles
 am__depfiles_remade = ./$(DEPDIR)/aboutdialog.Po \
 	./$(DEPDIR)/associatedialog.Po ./$(DEPDIR)/binaryfile.Po \
 	./$(DEPDIR)/casehandler.Po ./$(DEPDIR)/catalogresolver.Po \
 	./$(DEPDIR)/commandpanel.Po ./$(DEPDIR)/contexthandler.Po \
 	./$(DEPDIR)/dtd2schema.Po ./$(DEPDIR)/exportdialog.Po \
 	./$(DEPDIR)/findreplacepanel.Po ./$(DEPDIR)/getword.Po \
 	./$(DEPDIR)/globalreplacedialog.Po ./$(DEPDIR)/housestyle.Po \
 	./$(DEPDIR)/housestylereader.Po \
 	./$(DEPDIR)/housestylewriter.Po ./$(DEPDIR)/insertpanel.Po \
 	./$(DEPDIR)/locationpanel.Po ./$(DEPDIR)/mp3album.Po \
 	./$(DEPDIR)/myhtmlpane.Po ./$(DEPDIR)/myipc.Po \
 	./$(DEPDIR)/mynotebook.Po ./$(DEPDIR)/mypropertysheet.Po \
 	./$(DEPDIR)/nocasecompare.Po ./$(DEPDIR)/pathresolver.Po \
 	./$(DEPDIR)/readfile.Po ./$(DEPDIR)/replace.Po \
 	./$(DEPDIR)/rule.Po ./$(DEPDIR)/styledialog.Po \
 	./$(DEPDIR)/threadreaper.Po ./$(DEPDIR)/validationthread.Po \
 	./$(DEPDIR)/wrapaspell.Po ./$(DEPDIR)/wrapdaisy.Po \
 	./$(DEPDIR)/wrapexpat.Po ./$(DEPDIR)/wraplibxml.Po \
 	./$(DEPDIR)/wrapregex.Po ./$(DEPDIR)/wraptempfilename.Po \
 	./$(DEPDIR)/wrapxerces.Po ./$(DEPDIR)/xercescatalogresolver.Po \
 	./$(DEPDIR)/xercesnetaccessor.Po \
 	./$(DEPDIR)/xmlassociatedtd.Po ./$(DEPDIR)/xmlassociatexsd.Po \
 	./$(DEPDIR)/xmlassociatexsl.Po ./$(DEPDIR)/xmlcopyeditor.Po \
 	./$(DEPDIR)/xmlcopyimg.Po ./$(DEPDIR)/xmlctrl.Po \
 	./$(DEPDIR)/xmldoc.Po ./$(DEPDIR)/xmlencodinghandler.Po \
 	./$(DEPDIR)/xmlencodingspy.Po ./$(DEPDIR)/xmlfilterreader.Po \
 	./$(DEPDIR)/xmlparseschemans.Po ./$(DEPDIR)/xmlprodnote.Po \
 	./$(DEPDIR)/xmlpromptgenerator.Po ./$(DEPDIR)/xmlrulereader.Po \
 	./$(DEPDIR)/xmlschemagenerator.Po \
 	./$(DEPDIR)/xmlschemalocator.Po \
 	./$(DEPDIR)/xmlshallowvalidator.Po \
 	./$(DEPDIR)/xmlsuppressprodnote.Po ./$(DEPDIR)/xmltextinfo.Po \
 	./$(DEPDIR)/xmlutf8reader.Po ./$(DEPDIR)/xmlwordcount.Po \
 	./$(DEPDIR)/xsllocator.Po
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@ -268,6 +232,8 @@ am__define_uniq_tagged_files = \
  unique=`for i in $$list; do \
    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@ -284,9 +250,8 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CSCOPE = @CSCOPE@
 CTAGS = @CTAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
@ -304,7 +269,6 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 ENCHANT_CFLAGS = @ENCHANT_CFLAGS@
 ENCHANT_LIBS = @ENCHANT_LIBS@
 ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@ -353,8 +317,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCRE2_CFLAGS = @PCRE2_CFLAGS@
 PCRE2_LIBS = @PCRE2_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@ -367,10 +329,6 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WX_LIBS = @WX_LIBS@
 XGETTEXT = @XGETTEXT@
 XML2_CFLAGS = @XML2_CFLAGS@
 XML2_LIBS = @XML2_LIBS@
 XSLT_CFLAGS = @XSLT_CFLAGS@
 XSLT_LIBS = @XSLT_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@ -431,7 +389,7 @@ top_srcdir = @top_srcdir@
 # these are the headers for your project
 noinst_HEADERS = $(srcdir)/*.h
 xmlcopyeditordir = ${prefix}/share/xmlcopyeditor
-pixmapdir = ${prefix}/share/pixmaps
+pixmapdir = /usr/share/pixmaps
 applicationsdir = /usr/share/applications
 # the application source, library search path, and link libraries
@ -504,9 +462,7 @@ xmlcopyeditor_LDADD = $(WX_LIBS) \
 	$(ASPELL_LIBS) \
 	$(ENCHANT_LIBS) \
 	$(GTK_LIBS) \
-	$(XSLT_LIBS) \
+	-lexpat -lxslt -lxml2 -lpcre -lxerces-c
 	$(PCRE2_LIBS) \
 	-lexpat -lxerces-c
 nobase_dist_xmlcopyeditor_DATA = $(srcdir)/catalog/catalog \
 	$(srcdir)/dtd/*.* \
@ -555,7 +511,7 @@ EXTRA_DIST = \
 	$(srcdir)/xmlcopyeditor.rc \
 	$(srcdir)/xmlschemaparser.cpp
-AM_CPPFLAGS = $(XML2_CFLAGS) $(ENCHANT_CFLAGS) $(GTK_CFLAGS) $(PCRE2_CFLAGS)
+AM_CPPFLAGS = -I/usr/include/libxml2 $(ENCHANT_CFLAGS) $(GTK_CFLAGS)
 all: all-am
 .SUFFIXES:
@ -577,8 +533,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@ -649,73 +605,67 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aboutdialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aboutdialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/associatedialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/associatedialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/binaryfile.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/binaryfile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/casehandler.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/casehandler.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/catalogresolver.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/catalogresolver.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commandpanel.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commandpanel.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/contexthandler.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/contexthandler.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dtd2schema.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dtd2schema.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exportdialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exportdialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/findreplacepanel.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/findreplacepanel.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getword.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getword.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/globalreplacedialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/globalreplacedialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/housestyle.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/housestyle.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/housestylereader.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/housestylereader.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/housestylewriter.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/housestylewriter.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/insertpanel.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/insertpanel.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/locationpanel.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/locationpanel.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mp3album.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mp3album.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/myhtmlpane.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/myhtmlpane.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/myipc.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/myipc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mynotebook.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mynotebook.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mypropertysheet.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mypropertysheet.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nocasecompare.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nocasecompare.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pathresolver.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pathresolver.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readfile.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readfile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/replace.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/replace.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rule.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rule.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/styledialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/styledialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/threadreaper.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/threadreaper.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/validationthread.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/validationthread.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrapaspell.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrapaspell.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrapdaisy.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrapdaisy.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrapexpat.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrapexpat.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wraplibxml.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wraplibxml.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrapregex.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrapregex.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wraptempfilename.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wraptempfilename.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrapxerces.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrapxerces.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xercescatalogresolver.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xercescatalogresolver.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xercesnetaccessor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xercesnetaccessor.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlassociatedtd.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlassociatedtd.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlassociatexsd.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlassociatexsd.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlassociatexsl.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlassociatexsl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlcopyeditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlcopyeditor.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlcopyimg.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlcopyimg.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlctrl.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlctrl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmldoc.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmldoc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlencodinghandler.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlencodinghandler.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlencodingspy.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlencodingspy.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlfilterreader.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlfilterreader.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlparseschemans.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlparseschemans.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlprodnote.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlprodnote.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlpromptgenerator.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlpromptgenerator.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlrulereader.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlrulereader.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlschemagenerator.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlschemagenerator.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlschemalocator.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlschemalocator.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlshallowvalidator.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlshallowvalidator.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlsuppressprodnote.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlsuppressprodnote.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmltextinfo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmltextinfo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlutf8reader.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlutf8reader.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlwordcount.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlwordcount.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsllocator.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsllocator.Po@am__quote@
 $(am__depfiles_remade):
 	@$(MKDIR_P) $(@D)
 	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
 am--depfiles: $(am__depfiles_remade)
 .cpp.o:
@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@ -840,10 +790,8 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@ -915,67 +863,7 @@ clean: clean-am
 clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
 distclean: distclean-am
-		-rm -f ./$(DEPDIR)/aboutdialog.Po
+	-rm -rf ./$(DEPDIR)
 	-rm -f ./$(DEPDIR)/associatedialog.Po
 	-rm -f ./$(DEPDIR)/binaryfile.Po
 	-rm -f ./$(DEPDIR)/casehandler.Po
 	-rm -f ./$(DEPDIR)/catalogresolver.Po
 	-rm -f ./$(DEPDIR)/commandpanel.Po
 	-rm -f ./$(DEPDIR)/contexthandler.Po
 	-rm -f ./$(DEPDIR)/dtd2schema.Po
 	-rm -f ./$(DEPDIR)/exportdialog.Po
 	-rm -f ./$(DEPDIR)/findreplacepanel.Po
 	-rm -f ./$(DEPDIR)/getword.Po
 	-rm -f ./$(DEPDIR)/globalreplacedialog.Po
 	-rm -f ./$(DEPDIR)/housestyle.Po
 	-rm -f ./$(DEPDIR)/housestylereader.Po
 	-rm -f ./$(DEPDIR)/housestylewriter.Po
 	-rm -f ./$(DEPDIR)/insertpanel.Po
 	-rm -f ./$(DEPDIR)/locationpanel.Po
 	-rm -f ./$(DEPDIR)/mp3album.Po
 	-rm -f ./$(DEPDIR)/myhtmlpane.Po
 	-rm -f ./$(DEPDIR)/myipc.Po
 	-rm -f ./$(DEPDIR)/mynotebook.Po
 	-rm -f ./$(DEPDIR)/mypropertysheet.Po
 	-rm -f ./$(DEPDIR)/nocasecompare.Po
 	-rm -f ./$(DEPDIR)/pathresolver.Po
 	-rm -f ./$(DEPDIR)/readfile.Po
 	-rm -f ./$(DEPDIR)/replace.Po
 	-rm -f ./$(DEPDIR)/rule.Po
 	-rm -f ./$(DEPDIR)/styledialog.Po
 	-rm -f ./$(DEPDIR)/threadreaper.Po
 	-rm -f ./$(DEPDIR)/validationthread.Po
 	-rm -f ./$(DEPDIR)/wrapaspell.Po
 	-rm -f ./$(DEPDIR)/wrapdaisy.Po
 	-rm -f ./$(DEPDIR)/wrapexpat.Po
 	-rm -f ./$(DEPDIR)/wraplibxml.Po
 	-rm -f ./$(DEPDIR)/wrapregex.Po
 	-rm -f ./$(DEPDIR)/wraptempfilename.Po
 	-rm -f ./$(DEPDIR)/wrapxerces.Po
 	-rm -f ./$(DEPDIR)/xercescatalogresolver.Po
 	-rm -f ./$(DEPDIR)/xercesnetaccessor.Po
 	-rm -f ./$(DEPDIR)/xmlassociatedtd.Po
 	-rm -f ./$(DEPDIR)/xmlassociatexsd.Po
 	-rm -f ./$(DEPDIR)/xmlassociatexsl.Po
 	-rm -f ./$(DEPDIR)/xmlcopyeditor.Po
 	-rm -f ./$(DEPDIR)/xmlcopyimg.Po
 	-rm -f ./$(DEPDIR)/xmlctrl.Po
 	-rm -f ./$(DEPDIR)/xmldoc.Po
 	-rm -f ./$(DEPDIR)/xmlencodinghandler.Po
 	-rm -f ./$(DEPDIR)/xmlencodingspy.Po
 	-rm -f ./$(DEPDIR)/xmlfilterreader.Po
 	-rm -f ./$(DEPDIR)/xmlparseschemans.Po
 	-rm -f ./$(DEPDIR)/xmlprodnote.Po
 	-rm -f ./$(DEPDIR)/xmlpromptgenerator.Po
 	-rm -f ./$(DEPDIR)/xmlrulereader.Po
 	-rm -f ./$(DEPDIR)/xmlschemagenerator.Po
 	-rm -f ./$(DEPDIR)/xmlschemalocator.Po
 	-rm -f ./$(DEPDIR)/xmlshallowvalidator.Po
 	-rm -f ./$(DEPDIR)/xmlsuppressprodnote.Po
 	-rm -f ./$(DEPDIR)/xmltextinfo.Po
 	-rm -f ./$(DEPDIR)/xmlutf8reader.Po
 	-rm -f ./$(DEPDIR)/xmlwordcount.Po
 	-rm -f ./$(DEPDIR)/xsllocator.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@ -1022,67 +910,7 @@ install-ps-am:
 installcheck-am:
 maintainer-clean: maintainer-clean-am
-		-rm -f ./$(DEPDIR)/aboutdialog.Po
+	-rm -rf ./$(DEPDIR)
 	-rm -f ./$(DEPDIR)/associatedialog.Po
 	-rm -f ./$(DEPDIR)/binaryfile.Po
 	-rm -f ./$(DEPDIR)/casehandler.Po
 	-rm -f ./$(DEPDIR)/catalogresolver.Po
 	-rm -f ./$(DEPDIR)/commandpanel.Po
 	-rm -f ./$(DEPDIR)/contexthandler.Po
 	-rm -f ./$(DEPDIR)/dtd2schema.Po
 	-rm -f ./$(DEPDIR)/exportdialog.Po
 	-rm -f ./$(DEPDIR)/findreplacepanel.Po
 	-rm -f ./$(DEPDIR)/getword.Po
 	-rm -f ./$(DEPDIR)/globalreplacedialog.Po
 	-rm -f ./$(DEPDIR)/housestyle.Po
 	-rm -f ./$(DEPDIR)/housestylereader.Po
 	-rm -f ./$(DEPDIR)/housestylewriter.Po
 	-rm -f ./$(DEPDIR)/insertpanel.Po
 	-rm -f ./$(DEPDIR)/locationpanel.Po
 	-rm -f ./$(DEPDIR)/mp3album.Po
 	-rm -f ./$(DEPDIR)/myhtmlpane.Po
 	-rm -f ./$(DEPDIR)/myipc.Po
 	-rm -f ./$(DEPDIR)/mynotebook.Po
 	-rm -f ./$(DEPDIR)/mypropertysheet.Po
 	-rm -f ./$(DEPDIR)/nocasecompare.Po
 	-rm -f ./$(DEPDIR)/pathresolver.Po
 	-rm -f ./$(DEPDIR)/readfile.Po
 	-rm -f ./$(DEPDIR)/replace.Po
 	-rm -f ./$(DEPDIR)/rule.Po
 	-rm -f ./$(DEPDIR)/styledialog.Po
 	-rm -f ./$(DEPDIR)/threadreaper.Po
 	-rm -f ./$(DEPDIR)/validationthread.Po
 	-rm -f ./$(DEPDIR)/wrapaspell.Po
 	-rm -f ./$(DEPDIR)/wrapdaisy.Po
 	-rm -f ./$(DEPDIR)/wrapexpat.Po
 	-rm -f ./$(DEPDIR)/wraplibxml.Po
 	-rm -f ./$(DEPDIR)/wrapregex.Po
 	-rm -f ./$(DEPDIR)/wraptempfilename.Po
 	-rm -f ./$(DEPDIR)/wrapxerces.Po
 	-rm -f ./$(DEPDIR)/xercescatalogresolver.Po
 	-rm -f ./$(DEPDIR)/xercesnetaccessor.Po
 	-rm -f ./$(DEPDIR)/xmlassociatedtd.Po
 	-rm -f ./$(DEPDIR)/xmlassociatexsd.Po
 	-rm -f ./$(DEPDIR)/xmlassociatexsl.Po
 	-rm -f ./$(DEPDIR)/xmlcopyeditor.Po
 	-rm -f ./$(DEPDIR)/xmlcopyimg.Po
 	-rm -f ./$(DEPDIR)/xmlctrl.Po
 	-rm -f ./$(DEPDIR)/xmldoc.Po
 	-rm -f ./$(DEPDIR)/xmlencodinghandler.Po
 	-rm -f ./$(DEPDIR)/xmlencodingspy.Po
 	-rm -f ./$(DEPDIR)/xmlfilterreader.Po
 	-rm -f ./$(DEPDIR)/xmlparseschemans.Po
 	-rm -f ./$(DEPDIR)/xmlprodnote.Po
 	-rm -f ./$(DEPDIR)/xmlpromptgenerator.Po
 	-rm -f ./$(DEPDIR)/xmlrulereader.Po
 	-rm -f ./$(DEPDIR)/xmlschemagenerator.Po
 	-rm -f ./$(DEPDIR)/xmlschemalocator.Po
 	-rm -f ./$(DEPDIR)/xmlshallowvalidator.Po
 	-rm -f ./$(DEPDIR)/xmlsuppressprodnote.Po
 	-rm -f ./$(DEPDIR)/xmltextinfo.Po
 	-rm -f ./$(DEPDIR)/xmlutf8reader.Po
 	-rm -f ./$(DEPDIR)/xmlwordcount.Po
 	-rm -f ./$(DEPDIR)/xsllocator.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
@ -1104,7 +932,7 @@ uninstall-am: uninstall-binPROGRAMS \
 .MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
 	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
 	ctags ctags-am distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
--- a/src/aspell/data/iso-8859-1.cmap
+++ b/src/aspell/data/iso-8859-1.cmap
@ -1,6 +1,6 @@
 INTERNAL
 /
-N 958
+N 957
 0000 > 00
 0001 > 01
 0002 > 02
@ -892,7 +892,6 @@ N 958
 2008 > 20 # compat
 2009 > 20 # compat
 200A > 20 # compat
 2019 > 27 # compat
 2024 > 2E # compat
 2025 > 2E 2E # compat
 2026 > 2E 2E 2E # compat
--- a/src/aspell/data/iso-8859-10.cmap
+++ b/src/aspell/data/iso-8859-10.cmap
@ -1,6 +1,6 @@
 INTERNAL
 /
-N 926
+N 925
 0000 > 00
 0001 > 01
 0002 > 02
@ -907,7 +907,6 @@ N 926
 2009 > 20 # compat
 200A > 20 # compat
 2015 > BD
 2019 > 27 # compat
 2024 > 2E # compat
 2025 > 2E 2E # compat
 2026 > 2E 2E 2E # compat
--- a/src/aspell/data/iso-8859-14.cmap
+++ b/src/aspell/data/iso-8859-14.cmap
@ -1,6 +1,6 @@
 INTERNAL
 /
-N 914
+N 913
 0000 > 00
 0001 > 01
 0002 > 02
@ -920,7 +920,6 @@ N 914
 2008 > 20 # compat
 2009 > 20 # compat
 200A > 20 # compat
 2019 > 27 # compat
 2024 > 2E # compat
 2025 > 2E 2E # compat
 2026 > 2E 2E 2E # compat
--- a/src/aspell/data/iso-8859-15.cmap
+++ b/src/aspell/data/iso-8859-15.cmap
@ -1,6 +1,6 @@
 INTERNAL
 /
-N 945
+N 944
 0000 > 00
 0001 > 01
 0002 > 02
@ -892,7 +892,6 @@ N 945
 2008 > 20 # compat
 2009 > 20 # compat
 200A > 20 # compat
 2019 > 27 # compat
 2024 > 2E # compat
 2025 > 2E 2E # compat
 2026 > 2E 2E 2E # compat
--- a/src/aspell/data/iso-8859-16.cmap
+++ b/src/aspell/data/iso-8859-16.cmap
@ -1,6 +1,6 @@
 INTERNAL
 /
-N 922
+N 921
 0000 > 00
 0001 > 01
 0002 > 02
@ -892,7 +892,6 @@ N 922
 2008 > 20 # compat
 2009 > 20 # compat
 200A > 20 # compat
 2019 > 27 # compat
 201D > B5
 201E > A5
 2024 > 2E # compat
--- a/src/aspell/data/iso-8859-2.cmap
+++ b/src/aspell/data/iso-8859-2.cmap
@ -1,6 +1,6 @@
 INTERNAL
 /
-N 926
+N 925
 0000 > 00
 0001 > 01
 0002 > 02
@ -913,7 +913,6 @@ N 926
 2008 > 20 # compat
 2009 > 20 # compat
 200A > 20 # compat
 2019 > 27 # compat
 2024 > 2E # compat
 2025 > 2E 2E # compat
 2026 > 2E 2E 2E # compat
--- a/src/aspell/data/iso-8859-3.cmap
+++ b/src/aspell/data/iso-8859-3.cmap
@ -1,6 +1,6 @@
 INTERNAL
 /
-N 932
+N 931
 0000 > 00
 0001 > 01
 0002 > 02
@ -901,7 +901,6 @@ N 932
 2008 > 20 # compat
 2009 > 20 # compat
 200A > 20 # compat
 2019 > 27 # compat
 2024 > 2E # compat
 2025 > 2E 2E # compat
 2026 > 2E 2E 2E # compat
--- a/src/aspell/data/iso-8859-4.cmap
+++ b/src/aspell/data/iso-8859-4.cmap
@ -1,6 +1,6 @@
 INTERNAL
 /
-N 933
+N 932
 0000 > 00
 0001 > 01
 0002 > 02
@ -909,7 +909,6 @@ N 933
 2008 > 20 # compat
 2009 > 20 # compat
 200A > 20 # compat
 2019 > 27 # compat
 2024 > 2E # compat
 2025 > 2E 2E # compat
 2026 > 2E 2E 2E # compat
--- a/src/aspell/data/iso-8859-9.cmap
+++ b/src/aspell/data/iso-8859-9.cmap
@ -1,6 +1,6 @@
 INTERNAL
 /
-N 955
+N 954
 0000 > 00
 0001 > 01
 0002 > 02
@ -898,7 +898,6 @@ N 955
 2008 > 20 # compat
 2009 > 20 # compat
 200A > 20 # compat
 2019 > 27 # compat
 2024 > 2E # compat
 2025 > 2E 2E # compat
 2026 > 2E 2E 2E # compat
--- a/src/aspell/dict/australian-variant_0.alias
+++ b/src/aspell/dict/australian-variant_0.alias
@ -1,2 +0,0 @@
 # Generated with Aspell Dicts "proc" script version 0.60.4
 add en_AU-variant_0.multi
--- a/src/aspell/dict/australian-variant_1.alias
+++ b/src/aspell/dict/australian-variant_1.alias
@ -1,2 +0,0 @@
 # Generated with Aspell Dicts "proc" script version 0.60.4
 add en_AU-variant_1.multi
--- a/src/aspell/dict/australian-w_accents.alias
+++ b/src/aspell/dict/australian-w_accents.alias
@ -1,2 +0,0 @@
 # Generated with Aspell Dicts "proc" script version 0.60.4
 add en_AU-w_accents.multi
--- a/src/aspell/dict/australian-wo_accents.alias
+++ b/src/aspell/dict/australian-wo_accents.alias
@ -1,2 +0,0 @@
 # Generated with Aspell Dicts "proc" script version 0.60.4
 add en_AU-wo_accents.multi
--- a/src/aspell/dict/australian.alias
+++ b/src/aspell/dict/australian.alias
@ -1,2 +0,0 @@
 # Generated with Aspell Dicts "proc" script version 0.60.4
 add en_AU.multi
--- a/src/aspell/dict/en-common.rws
+++ b/src/aspell/dict/en-common.rws
--- a/src/aspell/dict/en-variant_0.rws
+++ b/src/aspell/dict/en-variant_0.rws
--- a/src/aspell/dict/en-variant_1.rws
+++ b/src/aspell/dict/en-variant_1.rws
--- a/src/aspell/dict/en-variant_2.rws
+++ b/src/aspell/dict/en-variant_2.rws
--- a/src/aspell/dict/en-w_accents-only.rws
+++ b/src/aspell/dict/en-w_accents-only.rws
--- a/src/aspell/dict/en-wo_accents-only.rws
+++ b/src/aspell/dict/en-wo_accents-only.rws
--- a/src/aspell/dict/en_AU-variant_0.multi
+++ b/src/aspell/dict/en_AU-variant_0.multi
@ -1,2 +0,0 @@
 # Generated with Aspell Dicts "proc" script version 0.60.4
 add en_AU-variant_0.rws
--- a/src/aspell/dict/en_AU-variant_0.rws
+++ b/src/aspell/dict/en_AU-variant_0.rws
--- a/src/aspell/dict/en_AU-variant_1.multi
+++ b/src/aspell/dict/en_AU-variant_1.multi
@ -1,2 +0,0 @@
 # Generated with Aspell Dicts "proc" script version 0.60.4
 add en_AU-variant_1.rws
--- a/src/aspell/dict/en_AU-variant_1.rws
+++ b/src/aspell/dict/en_AU-variant_1.rws
--- a/src/aspell/dict/en_AU-w_accents-only.rws
+++ b/src/aspell/dict/en_AU-w_accents-only.rws
--- a/src/aspell/dict/en_AU-w_accents.multi
+++ b/src/aspell/dict/en_AU-w_accents.multi
@ -1,3 +0,0 @@
 # Generated with Aspell Dicts "proc" script version 0.60.4
 add en-common.rws
 add en_AU-w_accents-only.rws
--- a/src/aspell/dict/en_AU-wo_accents-only.rws
+++ b/src/aspell/dict/en_AU-wo_accents-only.rws
--- a/src/aspell/dict/en_AU-wo_accents.multi
+++ b/src/aspell/dict/en_AU-wo_accents.multi
@ -1,3 +0,0 @@
 # Generated with Aspell Dicts "proc" script version 0.60.4
 add en-common.rws
 add en_AU-wo_accents-only.rws
--- a/src/aspell/dict/en_AU.multi
+++ b/src/aspell/dict/en_AU.multi
@ -1,2 +0,0 @@
 # Generated with Aspell Dicts "proc" script version 0.60.4
 add en_AU-wo_accents.multi
--- a/src/aspell/dict/en_CA-variant_0.rws
+++ b/src/aspell/dict/en_CA-variant_0.rws
--- a/src/aspell/dict/en_CA-variant_1.rws
+++ b/src/aspell/dict/en_CA-variant_1.rws
--- a/src/aspell/dict/en_CA-w_accents-only.rws
+++ b/src/aspell/dict/en_CA-w_accents-only.rws
--- a/src/aspell/dict/en_CA-wo_accents-only.rws
+++ b/src/aspell/dict/en_CA-wo_accents-only.rws
--- a/src/aspell/dict/en_GB-ise-w_accents-only.rws
+++ b/src/aspell/dict/en_GB-ise-w_accents-only.rws
--- a/src/aspell/dict/en_GB-ise-wo_accents-only.rws
+++ b/src/aspell/dict/en_GB-ise-wo_accents-only.rws
--- a/src/aspell/dict/en_GB-ize-w_accents-only.rws
+++ b/src/aspell/dict/en_GB-ize-w_accents-only.rws
--- a/src/aspell/dict/en_GB-ize-wo_accents-only.rws
+++ b/src/aspell/dict/en_GB-ize-wo_accents-only.rws
--- a/src/aspell/dict/en_GB-variant_0.rws
+++ b/src/aspell/dict/en_GB-variant_0.rws
--- a/src/aspell/dict/en_GB-variant_1.rws
+++ b/src/aspell/dict/en_GB-variant_1.rws
--- a/src/aspell/dict/en_US-w_accents-only.rws
+++ b/src/aspell/dict/en_US-w_accents-only.rws
--- a/src/aspell/dict/en_US-wo_accents-only.rws
+++ b/src/aspell/dict/en_US-wo_accents-only.rws
--- a/src/bin/doc2xml.exe
+++ b/src/bin/doc2xml.exe
--- a/src/bin/xml2doc.exe
+++ b/src/bin/xml2doc.exe
--- a/src/casehandler.h
+++ b/src/casehandler.h
@ -23,7 +23,7 @@
 #include <string>
-using std::string;
+using namespace std;
 class CaseHandler
 {
--- a/src/commandpanel.cpp
+++ b/src/commandpanel.cpp
@ -18,7 +18,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include <wx/wx.h>
 #include <wx/utils.h>
 #include "commandpanel.h"
 #include "xmlcopyeditor.h"
--- a/src/contexthandler.h
+++ b/src/contexthandler.h
@ -23,7 +23,7 @@
 #include <string>
-using std::string;
+using namespace std;
 class ContextMatch
 {
--- a/src/copying/xmlcopyeditor/copying.txt
+++ b/src/copying/xmlcopyeditor/copying.txt
@ -1,6 +1,6 @@
 XML Copy Editor
-Copyright (c) 2005-2022 Gerald Schmidt
+Copyright (c) 2005-2007 Gerald Schmidt
 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 the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
--- a/src/housestyle.cpp
+++ b/src/housestyle.cpp
@ -145,9 +145,9 @@ void HouseStyle::collectRules ( const std::string& fileName,
 	{
 		std::string report = xrr->getIncorrectPatternReport();
 		if ( report != "" )
-			throw std::runtime_error ( report.c_str() );
+			throw runtime_error ( report.c_str() );
 		else
-			throw std::runtime_error ( ( const char * ) xrr->getLastError().utf8_str() );
+			throw runtime_error ( ( const char * ) xrr->getLastError().utf8_str() );
 	}
 	// add current file to exclude set
--- a/src/housestylereader.h
+++ b/src/housestylereader.h
@ -28,10 +28,7 @@
 #include <boost/scoped_ptr.hpp>
 #include "wrapexpat.h"
-using std::map;
+using namespace std;
 using std::vector;
 using std::set;
 using std::string;
 struct HouseStyleReaderData : public ParserData
 {
--- a/src/housestylewriter.h
+++ b/src/housestylewriter.h
@ -28,9 +28,7 @@
 #include "wrapregex.h"
 #include "contexthandler.h"
-using std::vector;
+using namespace std;
 using std::set;
 using std::string;
 struct HouseStyleWriterData : public ParserData
 {
--- a/src/myipc.cpp
+++ b/src/myipc.cpp
@ -25,7 +25,7 @@
 #if defined ( __WXGTK__ ) && !defined ( __NO_GTK__ )
 #include <gtk/gtk.h>
-#include <gdk/gdkx.h>
+#include <gtk/gtkx.h>
 void MyRaiseWindow ( wxTopLevelWindow *wnd )
 {
@ -44,10 +44,8 @@ void MyRaiseWindow ( wxTopLevelWindow *wnd )
 	// again from the command line, a dialog that prompts the user to save
 	// the file pops up. After the dialog is closed, opening files from the
 	// command line is unable to bring the editor to the front.
-	guint32 time = GDK_IS_X11_WINDOW ( gwnd ) // GDK_BACKEND=x11?
+	gtk_window_present_with_time ( GTK_WINDOW ( widget ),
-					? gdk_x11_get_server_time ( gwnd )
+		gdk_x11_get_server_time ( gwnd ) );
 					: GDK_CURRENT_TIME;
 	gtk_window_present_with_time ( GTK_WINDOW ( widget ), time );
 }
 #else // __WXGTK__
@ -140,16 +138,8 @@ IPCData *MyServerConnection::OnRequest
 {
 	if ( size == NULL )
 		return NULL;
 #if wxUSE_DDE_FOR_IPC
 	// wxDDEConnection::Request validates the return data
 	const static char data[] = "Data";
 	*size = 1;
 	return data;
 #else
 	*size = 0;
 	return NULL;
 #endif
 }
 bool MyServerConnection::OnStartAdvise ( const wxString& WXUNUSED ( topic ),
--- a/src/nocasecompare.h
+++ b/src/nocasecompare.h
@ -20,7 +20,7 @@
 #include <string>
-using std::string;
+using namespace std;
 class NoCaseCompare
 {
--- a/src/rule.cpp
+++ b/src/rule.cpp
@ -26,11 +26,12 @@ using namespace std;
 Rule::Rule (
    const string& pattern,
    bool matchCase,
-    const string& replace
+    const string& replace,
-	) : WrapRegex (
+    const int arrayLength ) : WrapRegex (
 		        pattern,
 		        matchCase,
-		        replace )
+		        replace,
 		        arrayLength )
 {
 	adjustCaseAttribute = tentativeAttribute = false;
 }
--- a/src/rule.h
+++ b/src/rule.h
@ -24,7 +24,7 @@
 #include <string>
 #include "wrapregex.h"
-using std::string;
+using namespace std;
 class Rule : public WrapRegex
 {
@ -32,7 +32,8 @@ class Rule : public WrapRegex
 		Rule (
 		    const string& pattern,
 		    bool matchCase,
-		    const string& replace = "");
+		    const string& replace = "",
 		    const int arrayLength = 60 );
 		bool getAdjustCaseAttribute();
 		bool getTentativeAttribute();
 		string getReport();
--- a/src/styledialog.cpp
+++ b/src/styledialog.cpp
@ -236,7 +236,7 @@ StyleDialog::StyleDialog (
 	// overall sizer
 	wxBoxSizer *reportTopSizer = new wxBoxSizer ( wxVERTICAL );
-	reportTopSizer->Add ( comboSizer, 0, wxALL, 5 );
+	reportTopSizer->Add ( comboSizer, 0, wxALL | wxALIGN_CENTER_VERTICAL, 5 );
 	reportTopSizer->Add ( table, 1, wxEXPAND | wxALL, 5 );
 	reportTopSizer->Add ( reportButtonSizer, 0, wxALL, 5 );
 	reportTopSizer->Add ( status, 0, wxEXPAND | wxALL );
--- a/src/wrapaspell.cpp
+++ b/src/wrapaspell.cpp
@ -40,13 +40,9 @@ WrapAspell::WrapAspell (
 )
 {
 #ifdef USE_ENCHANT
 #ifdef HAVE_LIBENCHANT_2
 	spell_broker = new enchant::Broker();
 #else // HAVE_LIBENCHANT_2
 	spell_broker = enchant::Broker::instance();
 #endif // HAVE_LIBENCHANT_2
 	spell_checker = spell_broker->request_dict( std::string ( lang.mb_str() ) );
-#else // HAVE_LIBENCHANT
+#else
 	spell_config = new_aspell_config();
 #ifdef __WXMSW__
@ -55,14 +51,12 @@ WrapAspell::WrapAspell (
 #endif
 	aspell_config_replace ( spell_config, "lang", lang.mb_str() );
 	aspell_config_replace ( spell_config, "encoding", "utf-8" );
 	AspellCanHaveError * possible_err = new_aspell_speller ( spell_config );
 	spell_checker = 0;
 	if ( aspell_error_number ( possible_err ) != 0)
 	{
-		const char *error = aspell_error_message ( possible_err );
+		puts ( aspell_error_message ( possible_err ) );
-		wxLogError ( error );
+		throw;
 		throw error;
 	}
 	else
 		spell_checker = to_aspell_speller ( possible_err ); 
@ -73,10 +67,7 @@ WrapAspell::~WrapAspell()
 { 
 #ifdef USE_ENCHANT
 	delete spell_checker;
-#ifdef HAVE_LIBENCHANT_2
+#else
 	delete spell_broker;
 #endif
 #else // USE_ENCHANT
 	delete_aspell_speller ( spell_checker ); 
 	delete_aspell_config ( spell_config );
 #endif
--- a/Show More
+++ b/Show More
		`@ -1,2 +0,0 @@`
			`# Generated with Aspell Dicts "proc" script version 0.60.4`
			`add en_AU-variant_0.multi`
		`@ -1,2 +0,0 @@`
			`# Generated with Aspell Dicts "proc" script version 0.60.4`
			`add en_AU-variant_1.multi`
		`@ -1,2 +0,0 @@`
			`# Generated with Aspell Dicts "proc" script version 0.60.4`
			`add en_AU-w_accents.multi`
		`@ -1,2 +0,0 @@`
			`# Generated with Aspell Dicts "proc" script version 0.60.4`
			`add en_AU-wo_accents.multi`
		`@ -1,2 +0,0 @@`
			`# Generated with Aspell Dicts "proc" script version 0.60.4`
			`add en_AU.multi`
		`@ -1,2 +0,0 @@`
			`# Generated with Aspell Dicts "proc" script version 0.60.4`
			`add en_AU-variant_0.rws`
		`@ -1,2 +0,0 @@`
			`# Generated with Aspell Dicts "proc" script version 0.60.4`
			`add en_AU-variant_1.rws`