162 changed files with 23875 additions and 32889 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,10 +1,6 @@
 .DS_Store
-**.dmg
+*.dmg
-**.app
+*.app
-**.swp
+*.bz2
 **.bz2
 xmlcopyeditor
 xmlcopyeditor.exe
 **.o
 tests-main
 thumbs.db
--- a/24
+++ b/24
@ -1,26 +1,6 @@
-# Version number followed by the release date
+1.2.1.5 2018/09/23
-
+  + Fixed #221 Patch for building with C++11 (Roger Leigh)
 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,8 +1,9 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
 # Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@ -14,61 +15,6 @@
@SET_MAKE@
 VPATH = @srcdir@
 am__is_gnu_make = { \
  if test -z '$(MAKELEVEL)'; then \
    false; \
  elif test -n '$(MAKE_HOST)'; then \
    true; \
  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
    true; \
  else \
    false; \
  fi; \
 }
 am__make_running_with_option = \
  case $${target_option-} in \
      ?) ;; \
      *) echo "am__make_running_with_option: internal error: invalid" \
              "target option '$${target_option-}' specified" >&2; \
         exit 1;; \
  esac; \
  has_opt=no; \
  sane_makeflags=$$MAKEFLAGS; \
  if $(am__is_gnu_make); then \
    sane_makeflags=$$MFLAGS; \
  else \
    case $$MAKEFLAGS in \
      *\\[\ \	]*) \
        bs=\\; \
        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
    esac; \
  fi; \
  skip_next=no; \
  strip_trailopt () \
  { \
    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
  }; \
  for flg in $$sane_makeflags; do \
    test $$skip_next = yes && { skip_next=no; continue; }; \
    case $$flg in \
      *=*|--*) continue;; \
        -*I) strip_trailopt 'I'; skip_next=yes;; \
      -*I?*) strip_trailopt 'I';; \
        -*O) strip_trailopt 'O'; skip_next=yes;; \
      -*O?*) strip_trailopt 'O';; \
        -*l) strip_trailopt 'l'; skip_next=yes;; \
      -*l?*) strip_trailopt 'l';; \
      -[dEDm]) skip_next=yes;; \
      -[JT]) skip_next=yes;; \
    esac; \
    case $$flg in \
      *$$target_option*) has_opt=yes; break;; \
    esac; \
  done; \
  test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@ -88,77 +34,36 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
 	ChangeLog INSTALL NEWS TODO config.guess config.rpath \
 	config.sub depcomp install-sh ltmain.sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
 	$(am__configure_deps) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
 am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
 am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	ctags-recursive dvi-recursive html-recursive info-recursive \
+	html-recursive info-recursive install-data-recursive \
-	install-data-recursive install-dvi-recursive \
+	install-dvi-recursive install-exec-recursive \
-	install-exec-recursive install-html-recursive \
+	install-html-recursive install-info-recursive \
-	install-info-recursive install-pdf-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
-	install-ps-recursive install-recursive installcheck-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
-	installdirs-recursive pdf-recursive ps-recursive \
+	ps-recursive uninstall-recursive
 	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
  case $$AM_UPDATE_INFO_DIR in \
    n|no|NO) false;; \
    *) (install-info --version) >/dev/null 2>&1;; \
  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
  distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-  $(RECURSIVE_TARGETS) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-  $(RECURSIVE_CLEAN_TARGETS) \
+	distdir dist dist-all distcheck
-  $(am__extra_recursive_targets)
+ETAGS = etags
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+CTAGS = ctags
 	cscope distdir distdir-am 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
 # *not* preserved.
 am__uniquify_input = $(AWK) '\
  BEGIN { nonempty = 0; } \
  { items[$$0] = 1; nonempty = 1; } \
  END { if (nonempty) { for (i in items) print i; }; } \
 '
 # Make sure the list of sources is unique.  This is necessary because,
 # e.g., the same source file might be shared among _SOURCES variables
 # for different programs/libraries.
 am__define_uniq_tagged_files = \
  list='$(am__tagged_files)'; \
  unique=`for i in $$list; do \
    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  done | $(am__uniquify_input)`
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in AUTHORS COPYING ChangeLog \
 	INSTALL NEWS README.md TODO compile config.guess config.rpath \
 	config.sub depcomp install-sh ltmain.sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@ -168,7 +73,6 @@ am__remove_distdir = \
      && rm -rf "$(distdir)" \
      || { sleep 5 && rm -rf "$(distdir)"; }; \
  else :; fi
 am__post_remove_distdir = $(am__remove_distdir)
 am__relativize = \
  dir0=`pwd`; \
  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@ -196,9 +100,6 @@ am__relativize = \
  reldir="$$dir2"
 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,14 +118,14 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CSCOPE = @CSCOPE@
 CTAGS = @CTAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
@ -237,14 +138,13 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 ENCHANT_CFLAGS = @ENCHANT_CFLAGS@
 ENCHANT_LIBS = @ENCHANT_LIBS@
 ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK2_CFLAGS = @GTK2_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
+GTK2_LIBS = @GTK2_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@ -266,7 +166,6 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@ -286,8 +185,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 +197,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@
@ -351,7 +244,6 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@ -388,14 +280,15 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *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)
@ -417,25 +310,22 @@ distclean-libtool:
 	-rm -f libtool config.lt
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
+# into them and run `make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
+# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
+# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run 'make');
+#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the 'make' command line.
+# (2) otherwise, pass the desired values on the `make' command line.
-$(am__recursive_targets):
+$(RECURSIVE_TARGETS):
-	@fail=; \
+	@fail= failcom='exit 1'; \
-	if $(am__make_keepgoing); then \
+	for f in x $$MAKEFLAGS; do \
-	  failcom='fail=yes'; \
+	  case $$f in \
-	else \
+	    *=* | --[!k]*);; \
-	  failcom='exit 1'; \
+	    *k*) failcom='fail=yes';; \
-	fi; \
+	  esac; \
 	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	case "$@" in \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
 	  *) list='$(SUBDIRS)' ;; \
 	esac; \
 	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@ -450,12 +340,57 @@ $(am__recursive_targets):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
-ID: $(am__tagged_files)
+$(RECURSIVE_CLEAN_TARGETS):
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
+	@fail= failcom='exit 1'; \
-tags: tags-recursive
+	for f in x $$MAKEFLAGS; do \
-TAGS: tags
+	  case $$f in \
 	    *=* | --[!k]*);; \
 	    *k*) failcom='fail=yes';; \
 	  esac; \
 	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
 	  *) list='$(SUBDIRS)' ;; \
 	esac; \
 	rev=''; for subdir in $$list; do \
 	  if test "$$subdir" = "."; then :; else \
 	    rev="$$subdir $$rev"; \
 	  fi; \
 	done; \
 	rev="$$rev ."; \
 	target=`echo $@ | sed s/-recursive//`; \
 	for subdir in $$rev; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    local_target="$$target-am"; \
 	  else \
 	    local_target="$$target"; \
 	  fi; \
 	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@ -471,7 +406,12 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	$(am__define_uniq_tagged_files); \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@ -483,11 +423,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	      $$unique; \
 	  fi; \
 	fi
-ctags: ctags-recursive
+ctags: CTAGS
-
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-CTAGS: ctags
+		$(TAGS_FILES) $(LISP)
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	$(am__define_uniq_tagged_files); \
+	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@ -496,35 +440,11 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 cscope: cscope.files
 	test ! -s cscope.files \
 	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
 clean-cscope:
 	-rm -f cscope.files
 cscope.files: clean-cscope cscopelist
 cscopelist: cscopelist-recursive
 cscopelist-am: $(am__tagged_files)
 	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
 	esac; \
 	for i in $$list; do \
 	  if test -f "$$i"; then \
 	    echo "$(subdir)/$$i"; \
 	  else \
 	    echo "$$sdir/$$i"; \
 	  fi; \
 	done >> $(top_builddir)/cscope.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'`; \
@ -558,10 +478,13 @@ distdir-am: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
+	    test -d "$(distdir)/$$subdir" \
-	      || test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
-	      || exit 1; \
+	  fi; \
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@ -589,47 +512,41 @@ distdir-am: $(DISTFILES)
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 dist-lzip: distdir
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 dist-lzma: distdir
 	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
 	$(am__remove_distdir)
 dist-xz: distdir
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-	$(am__post_remove_distdir)
+	$(am__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
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 dist-shar: distdir
-	@echo WARNING: "Support for shar distribution archives is" \
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	               "deprecated." >&2
+	$(am__remove_distdir)
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
-dist dist-all:
+dist dist-all: distdir
-	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
@ -637,9 +554,11 @@ dist dist-all:
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
 	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.lz*) \
 	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
@ -647,27 +566,24 @@ distcheck: dist
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
+	  GZIP=$(GZIP_ENV) gzip -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 -R a-w $(distdir); chmod a+w $(distdir)
-	chmod u+w $(distdir)
+	mkdir $(distdir)/_build
-	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
+	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build/sub \
+	  && $(am__cd) $(distdir)/_build \
-	  && ../../configure \
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(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 \
@ -688,7 +604,7 @@ distcheck: dist
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
@ -823,26 +739,24 @@ ps-am:
 uninstall-am:
-.MAKE: $(am__recursive_targets) install-am install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
 	install-am install-strip tags-recursive
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	am--refresh check check-am clean clean-cscope clean-generic \
+	all all-am am--refresh check check-am clean clean-generic \
-	clean-libtool cscope cscopelist-am ctags ctags-am dist \
+	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
+	dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
-	dist-xz dist-zip dist-zstd distcheck distclean \
+	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-recursive uninstall uninstall-am
 	uninstall-am
 .PRECIOUS: Makefile
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/aclocal.m4
+++ b/aclocal.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/12210
+++ b/12210
--- 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,20 +59,50 @@ 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],
 [
  debugbuild="y"
  CXXFLAGS="${CXXFLAGS} -ggdb -O0"
 ], [
  CXXFLAGS="${CXXFLAGS} -DNDEBUG -DwxDEBUG_LEVEL=0"
 ])
 # 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 +134,21 @@ 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([GTK2], [gtk+-2.0], [AC_DEFINE([HAVE_GTK2], [1], [Define if gtk+-2.0 exist.])]
-		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.
 		]
 	)],
 	[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 +157,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
@ -164,7 +169,7 @@ echo "Debug         Enabled"
 else
 echo "Debug         Disabled"
 fi
-if [[ "$GTK_LIBS" = "" ]]; then
+if [[ "$GTK2_LIBS" = "" ]]; then
 echo "GTK           No. There will be problems when single instance is enabled."
 fi
--- 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,8 +1,9 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
 # Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@ -15,61 +16,6 @@
@SET_MAKE@
 VPATH = @srcdir@
 am__is_gnu_make = { \
  if test -z '$(MAKELEVEL)'; then \
    false; \
  elif test -n '$(MAKE_HOST)'; then \
    true; \
  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
    true; \
  else \
    false; \
  fi; \
 }
 am__make_running_with_option = \
  case $${target_option-} in \
      ?) ;; \
      *) echo "am__make_running_with_option: internal error: invalid" \
              "target option '$${target_option-}' specified" >&2; \
         exit 1;; \
  esac; \
  has_opt=no; \
  sane_makeflags=$$MAKEFLAGS; \
  if $(am__is_gnu_make); then \
    sane_makeflags=$$MFLAGS; \
  else \
    case $$MAKEFLAGS in \
      *\\[\ \	]*) \
        bs=\\; \
        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
    esac; \
  fi; \
  skip_next=no; \
  strip_trailopt () \
  { \
    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
  }; \
  for flg in $$sane_makeflags; do \
    test $$skip_next = yes && { skip_next=no; continue; }; \
    case $$flg in \
      *=*|--*) continue;; \
        -*I) strip_trailopt 'I'; skip_next=yes;; \
      -*I?*) strip_trailopt 'I';; \
        -*O) strip_trailopt 'O'; skip_next=yes;; \
      -*O?*) strip_trailopt 'O';; \
        -*l) strip_trailopt 'l'; skip_next=yes;; \
      -*l?*) strip_trailopt 'l';; \
      -[dEDm]) skip_next=yes;; \
      -[JT]) skip_next=yes;; \
    esac; \
    case $$flg in \
      *$$target_option*) has_opt=yes; break;; \
    esac; \
  done; \
  test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@ -89,37 +35,16 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = data
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
 am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
 am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
  case $$AM_UPDATE_INFO_DIR in \
    n|no|NO) false;; \
    *) (install-info --version) >/dev/null 2>&1;; \
  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@ -153,8 +78,6 @@ am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(appdatadir)" \
 NROFF = nroff
 MANS = $(man_MANS)
 DATA = $(appdata_DATA) $(desktop_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@ -170,14 +93,14 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CSCOPE = @CSCOPE@
 CTAGS = @CTAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
@ -190,14 +113,13 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 ENCHANT_CFLAGS = @ENCHANT_CFLAGS@
 ENCHANT_LIBS = @ENCHANT_LIBS@
 ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK2_CFLAGS = @GTK2_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
+GTK2_LIBS = @GTK2_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@ -219,7 +141,6 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@ -239,8 +160,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 +172,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@
@ -304,7 +219,6 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@ -317,7 +231,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
@ -345,13 +259,14 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign data/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__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)
@ -370,18 +285,11 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-man1: $(man_MANS)
 	@$(NORMAL_INSTALL)
-	@list1=''; \
+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	list2='$(man_MANS)'; \
+	@list=''; test -n "$(man1dir)" || exit 0; \
-	test -n "$(man1dir)" \
+	{ for i in $$list; do echo "$$i"; done; \
-	  && test -n "`echo $$list1$$list2`" \
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  || exit 0; \
+	  sed -n '/\.1[a-z]*$$/p'; \
 	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
 	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
 	{ for i in $$list1; do echo "$$i"; done;  \
 	if test -n "$$list2"; then \
 	  for i in $$list2; do echo "$$i"; done \
 	    | sed -n '/\.1[a-z]*$$/p'; \
 	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@ -413,11 +321,8 @@ uninstall-man1:
 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 install-appdataDATA: $(appdata_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(appdatadir)" || $(MKDIR_P) "$(DESTDIR)$(appdatadir)"
 	@list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \
 	if test -n "$$list"; then \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(appdatadir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(appdatadir)" || exit 1; \
 	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@ -434,11 +339,8 @@ uninstall-appdataDATA:
 	dir='$(DESTDIR)$(appdatadir)'; $(am__uninstall_files_from_dir)
 install-desktopDATA: $(desktop_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
 	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
 	if test -n "$$list"; then \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
 	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@ -453,16 +355,27 @@ uninstall-desktopDATA:
 	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
-tags TAGS:
+tags: TAGS
 TAGS:
-ctags CTAGS:
+ctags: CTAGS
 CTAGS:
 cscope cscopelist:
-distdir: $(BUILT_SOURCES)
+distdir: $(DISTFILES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+	@list='$(MANS)'; if test -n "$$list"; then \
-
+	  list=`for p in $$list; do \
-distdir-am: $(DISTFILES)
+	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
 	  if test -n "$$list" && \
 	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
 	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
 	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
 	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
 	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
 	    exit 1; \
 	  else :; fi; \
 	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@ -603,20 +516,18 @@ uninstall-man: uninstall-man1
 .MAKE: check-am install-am install-strip
 .PHONY: all all-am check check-am check-local clean clean-generic \
-	clean-libtool cscopelist-am ctags-am distclean \
+	clean-libtool distclean distclean-generic distclean-libtool \
-	distclean-generic distclean-libtool distdir dvi dvi-am html \
+	distdir dvi dvi-am html html-am info info-am install \
-	html-am info info-am install install-am install-appdataDATA \
+	install-am install-appdataDATA install-data install-data-am \
-	install-data install-data-am install-desktopDATA install-dvi \
+	install-desktopDATA 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-man1 install-pdf \
-	install-man1 install-pdf install-pdf-am install-ps \
+	install-pdf-am install-ps install-ps-am install-strip \
-	install-ps-am install-strip installcheck installcheck-am \
+	installcheck installcheck-am installdirs maintainer-clean \
-	installdirs 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 uninstall uninstall-am \
-	ps ps-am tags-am uninstall uninstall-am uninstall-appdataDATA \
+	uninstall-appdataDATA uninstall-desktopDATA uninstall-man \
-	uninstall-desktopDATA uninstall-man uninstall-man1
+	uninstall-man1
 .PRECIOUS: Makefile
@INTLTOOL_DESKTOP_RULE@
@INTLTOOL_XML_RULE@
--- 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
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
 # Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@ -14,61 +15,6 @@
@SET_MAKE@
 VPATH = @srcdir@
 am__is_gnu_make = { \
  if test -z '$(MAKELEVEL)'; then \
    false; \
  elif test -n '$(MAKE_HOST)'; then \
    true; \
  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
    true; \
  else \
    false; \
  fi; \
 }
 am__make_running_with_option = \
  case $${target_option-} in \
      ?) ;; \
      *) echo "am__make_running_with_option: internal error: invalid" \
              "target option '$${target_option-}' specified" >&2; \
         exit 1;; \
  esac; \
  has_opt=no; \
  sane_makeflags=$$MAKEFLAGS; \
  if $(am__is_gnu_make); then \
    sane_makeflags=$$MFLAGS; \
  else \
    case $$MAKEFLAGS in \
      *\\[\ \	]*) \
        bs=\\; \
        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
    esac; \
  fi; \
  skip_next=no; \
  strip_trailopt () \
  { \
    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
  }; \
  for flg in $$sane_makeflags; do \
    test $$skip_next = yes && { skip_next=no; continue; }; \
    case $$flg in \
      *=*|--*) continue;; \
        -*I) strip_trailopt 'I'; skip_next=yes;; \
      -*I?*) strip_trailopt 'I';; \
        -*O) strip_trailopt 'O'; skip_next=yes;; \
      -*O?*) strip_trailopt 'O';; \
        -*l) strip_trailopt 'l'; skip_next=yes;; \
      -*l?*) strip_trailopt 'l';; \
      -[dEDm]) skip_next=yes;; \
      -[JT]) skip_next=yes;; \
    esac; \
    case $$flg in \
      *$$target_option*) has_opt=yes; break;; \
    esac; \
  done; \
  test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@ -88,39 +34,16 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = m4
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
 am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
 am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
  case $$AM_UPDATE_INFO_DIR in \
    n|no|NO) false;; \
    *) (install-info --version) >/dev/null 2>&1;; \
  esac
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@ -136,14 +59,14 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CSCOPE = @CSCOPE@
 CTAGS = @CTAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
@ -156,14 +79,13 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 ENCHANT_CFLAGS = @ENCHANT_CFLAGS@
 ENCHANT_LIBS = @ENCHANT_LIBS@
 ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK2_CFLAGS = @GTK2_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
+GTK2_LIBS = @GTK2_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@ -185,7 +107,6 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@ -205,8 +126,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 +138,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@
@ -270,7 +185,6 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@ -309,13 +223,14 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign m4/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign m4/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__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)
@ -332,16 +247,14 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
-tags TAGS:
+tags: TAGS
 TAGS:
-ctags CTAGS:
+ctags: CTAGS
 CTAGS:
 cscope cscopelist:
-distdir: $(BUILT_SOURCES)
+distdir: $(DISTFILES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@ -474,18 +387,15 @@ uninstall-am:
 .MAKE: install-am install-strip
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
+	distclean distclean-generic distclean-libtool distdir dvi \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	dvi-am html html-am info info-am install install-am \
-	install install-am install-data install-data-am install-dvi \
+	install-data install-data-am install-dvi install-dvi-am \
-	install-dvi-am install-exec install-exec-am install-html \
+	install-exec install-exec-am install-html install-html-am \
-	install-html-am install-info install-info-am install-man \
+	install-info install-info-am install-man install-pdf \
-	install-pdf install-pdf-am install-ps install-ps-am \
+	install-pdf-am install-ps install-ps-am install-strip \
-	install-strip installcheck installcheck-am installdirs \
+	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean maintainer-clean-generic mostlyclean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
 	tags-am uninstall uninstall-am
 .PRECIOUS: Makefile
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- 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
--- a/m4/ltoptions.m4
+++ b/m4/ltoptions.m4
@ -1,14 +1,14 @@
 # Helper functions for option handling.                    -*- Autoconf -*-
 #
-#   Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
+#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
-#   Foundation, Inc.
+#   Inc.
 #   Written by Gary V. Vaughan, 2004
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
-# serial 8 ltoptions.m4
+# serial 7 ltoptions.m4
 # This is to help aclocal find these macros, as it can't see m4_define.
 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@ -29,7 +29,7 @@ m4_define([_LT_SET_OPTION],
 [m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
 m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
        _LT_MANGLE_DEFUN([$1], [$2]),
-    [m4_warning([Unknown $1 option '$2'])])[]dnl
+    [m4_warning([Unknown $1 option `$2'])])[]dnl
 ])
@ -75,15 +75,13 @@ m4_if([$1],[LT_INIT],[
  dnl
  dnl If no reference was made to various pairs of opposing options, then
  dnl we run the default mode handler for the pair.  For example, if neither
-  dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
+  dnl `shared' nor `disable-shared' was passed, we enable building of shared
  dnl archives by default:
  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-		   [_LT_ENABLE_FAST_INSTALL])
+  		   [_LT_ENABLE_FAST_INSTALL])
  _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
 		   [_LT_WITH_AIX_SONAME([aix])])
  ])
 ])# _LT_SET_OPTIONS
@ -114,7 +112,7 @@ AU_DEFUN([AC_LIBTOOL_DLOPEN],
 [_LT_SET_OPTION([LT_INIT], [dlopen])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the 'dlopen' option into LT_INIT's first parameter.])
+put the `dlopen' option into LT_INIT's first parameter.])
 ])
 dnl aclocal-1.4 backwards compatibility:
@ -150,7 +148,7 @@ AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
 _LT_SET_OPTION([LT_INIT], [win32-dll])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the 'win32-dll' option into LT_INIT's first parameter.])
+put the `win32-dll' option into LT_INIT's first parameter.])
 ])
 dnl aclocal-1.4 backwards compatibility:
@ -159,9 +157,9 @@ dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
 # _LT_ENABLE_SHARED([DEFAULT])
 # ----------------------------
-# implement the --enable-shared flag, and supports the 'shared' and
+# implement the --enable-shared flag, and supports the `shared' and
-# 'disable-shared' LT_INIT options.
+# `disable-shared' LT_INIT options.
-# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
 m4_define([_LT_ENABLE_SHARED],
 [m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
 AC_ARG_ENABLE([shared],
@ -174,14 +172,14 @@ AC_ARG_ENABLE([shared],
    *)
      enable_shared=no
      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
      for pkg in $enableval; do
-	IFS=$lt_save_ifs
+	IFS="$lt_save_ifs"
 	if test "X$pkg" = "X$p"; then
 	  enable_shared=yes
 	fi
      done
-      IFS=$lt_save_ifs
+      IFS="$lt_save_ifs"
      ;;
    esac],
    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
@ -213,9 +211,9 @@ dnl AC_DEFUN([AM_DISABLE_SHARED], [])
 # _LT_ENABLE_STATIC([DEFAULT])
 # ----------------------------
-# implement the --enable-static flag, and support the 'static' and
+# implement the --enable-static flag, and support the `static' and
-# 'disable-static' LT_INIT options.
+# `disable-static' LT_INIT options.
-# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
 m4_define([_LT_ENABLE_STATIC],
 [m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
 AC_ARG_ENABLE([static],
@ -228,14 +226,14 @@ AC_ARG_ENABLE([static],
    *)
     enable_static=no
      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
      for pkg in $enableval; do
-	IFS=$lt_save_ifs
+	IFS="$lt_save_ifs"
 	if test "X$pkg" = "X$p"; then
 	  enable_static=yes
 	fi
      done
-      IFS=$lt_save_ifs
+      IFS="$lt_save_ifs"
      ;;
    esac],
    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
@ -267,9 +265,9 @@ dnl AC_DEFUN([AM_DISABLE_STATIC], [])
 # _LT_ENABLE_FAST_INSTALL([DEFAULT])
 # ----------------------------------
-# implement the --enable-fast-install flag, and support the 'fast-install'
+# implement the --enable-fast-install flag, and support the `fast-install'
-# and 'disable-fast-install' LT_INIT options.
+# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
 m4_define([_LT_ENABLE_FAST_INSTALL],
 [m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
 AC_ARG_ENABLE([fast-install],
@ -282,14 +280,14 @@ AC_ARG_ENABLE([fast-install],
    *)
      enable_fast_install=no
      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
      for pkg in $enableval; do
-	IFS=$lt_save_ifs
+	IFS="$lt_save_ifs"
 	if test "X$pkg" = "X$p"; then
 	  enable_fast_install=yes
 	fi
      done
-      IFS=$lt_save_ifs
+      IFS="$lt_save_ifs"
      ;;
    esac],
    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
@ -306,14 +304,14 @@ AU_DEFUN([AC_ENABLE_FAST_INSTALL],
 [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the 'fast-install' option into LT_INIT's first parameter.])
+the `fast-install' option into LT_INIT's first parameter.])
 ])
 AU_DEFUN([AC_DISABLE_FAST_INSTALL],
 [_LT_SET_OPTION([LT_INIT], [disable-fast-install])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the 'disable-fast-install' option into LT_INIT's first parameter.])
+the `disable-fast-install' option into LT_INIT's first parameter.])
 ])
 dnl aclocal-1.4 backwards compatibility:
@ -321,64 +319,11 @@ dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
 dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
 # _LT_WITH_AIX_SONAME([DEFAULT])
 # ----------------------------------
 # implement the --with-aix-soname flag, and support the `aix-soname=aix'
 # and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
 # is either `aix', `both' or `svr4'.  If omitted, it defaults to `aix'.
 m4_define([_LT_WITH_AIX_SONAME],
 [m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
 shared_archive_member_spec=
 case $host,$enable_shared in
 power*-*-aix[[5-9]]*,yes)
  AC_MSG_CHECKING([which variant of shared library versioning to provide])
  AC_ARG_WITH([aix-soname],
    [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
      [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
    [case $withval in
    aix|svr4|both)
      ;;
    *)
      AC_MSG_ERROR([Unknown argument to --with-aix-soname])
      ;;
    esac
    lt_cv_with_aix_soname=$with_aix_soname],
    [AC_CACHE_VAL([lt_cv_with_aix_soname],
      [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
    with_aix_soname=$lt_cv_with_aix_soname])
  AC_MSG_RESULT([$with_aix_soname])
  if test aix != "$with_aix_soname"; then
    # For the AIX way of multilib, we name the shared archive member
    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
    # the AIX toolchain works better with OBJECT_MODE set (default 32).
    if test 64 = "${OBJECT_MODE-32}"; then
      shared_archive_member_spec=shr_64
    else
      shared_archive_member_spec=shr
    fi
  fi
  ;;
 *)
  with_aix_soname=aix
  ;;
 esac
 _LT_DECL([], [shared_archive_member_spec], [0],
    [Shared archive member basename, for filename based shared library versioning on AIX])dnl
 ])# _LT_WITH_AIX_SONAME
 LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
 LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
 LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
 # _LT_WITH_PIC([MODE])
 # --------------------
-# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
+# implement the --with-pic flag, and support the `pic-only' and `no-pic'
 # LT_INIT options.
-# MODE is either 'yes' or 'no'.  If omitted, it defaults to 'both'.
+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
 m4_define([_LT_WITH_PIC],
 [AC_ARG_WITH([pic],
    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
@ -389,17 +334,19 @@ m4_define([_LT_WITH_PIC],
    *)
      pic_mode=default
      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
      for lt_pkg in $withval; do
-	IFS=$lt_save_ifs
+	IFS="$lt_save_ifs"
 	if test "X$lt_pkg" = "X$lt_p"; then
 	  pic_mode=yes
 	fi
      done
-      IFS=$lt_save_ifs
+      IFS="$lt_save_ifs"
      ;;
    esac],
-    [pic_mode=m4_default([$1], [default])])
+    [pic_mode=default])
 test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
 _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
 ])# _LT_WITH_PIC
@ -412,7 +359,7 @@ AU_DEFUN([AC_LIBTOOL_PICMODE],
 [_LT_SET_OPTION([LT_INIT], [pic-only])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the 'pic-only' option into LT_INIT's first parameter.])
+put the `pic-only' option into LT_INIT's first parameter.])
 ])
 dnl aclocal-1.4 backwards compatibility:
--- 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/ltversion.m4
+++ b/m4/ltversion.m4
@ -1,6 +1,6 @@
 # ltversion.m4 -- version numbers			-*- Autoconf -*-
 #
-#   Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
+#   Copyright (C) 2004 Free Software Foundation, Inc.
 #   Written by Scott James Remnant, 2004
 #
 # This file is free software; the Free Software Foundation gives
@ -9,15 +9,15 @@
 # @configure_input@
-# serial 4179 ltversion.m4
+# serial 3337 ltversion.m4
 # This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.4.6])
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
-m4_define([LT_PACKAGE_REVISION], [2.4.6])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.6'
+[macro_version='2.4.2'
-macro_revision='2.4.6'
+macro_revision='1.3337'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
--- 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.
 #
@ -26,7 +25,7 @@
 # included after everything else.  This provides aclocal with the
 # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
 # because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
 #
 # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
 # Yes, that means every name once taken will need to remain here until
--- a/mac/Makefile
+++ b/mac/Makefile
@ -1,5 +1,5 @@
 build:
-	`/usr/local/bin/wx-config --linkdeps --cxx --cxxflags --libs all` -L /usr/local/lib -I /usr/local/Cellar/libxml2/2.9.7/include/libxml2 -I /usr/include -I /usr/local/include -I /usr/include/libxml2 -I ../src -liconv -lexpat -lxml2 -lxslt -laspell.15 -lxerces-c -lpcre -o xmlcopyeditor ../src/*.cpp
+	`wx-config --cxx --cxxflags --libs all` -I /usr/include -I /usr/local/include -I /usr/include/libxml2 -I ../src -lxml2 -lxslt -laspell.15 -lxerces-c -lpcre -o xmlcopyeditor ../src/*.cpp
 bundle: Info.plist xmlcopyeditor version.plist InfoPlist.strings xmlcopyeditor.icns
 	SetFile -t APPL xmlcopyeditor
 	-mkdir xmlcopyeditor.app
@ -27,14 +27,14 @@ bundle: Info.plist xmlcopyeditor version.plist InfoPlist.strings xmlcopyeditor.i
 	cp -R ../src/xsl xmlcopyeditor.app/Contents/SharedSupport/
 	cp xmlcopyeditor.icns xmlcopyeditor.app/Contents/Resources/
 	# process xmlcopyeditor
-	for DYLIB in lib/libxml2.2 lib/libxslt.1 lib/libpcre.0 local/lib/libaspell.15 local/lib/libxerces-c-3.2 local/lib/libpng15.15 local/lib/libjpeg.8 local/lib/libtiff.5 lib/libexpat.1 lib/libz.1 lib/libiconv.2; do BASENAME=`basename /usr/$${DYLIB}.dylib`; echo "relinking $${BASENAME}"; cp /usr/$${DYLIB}.dylib xmlcopyeditor.app/Contents/Frameworks/; install_name_tool -change /usr/$${DYLIB}.dylib @executable_path/../Frameworks/$${BASENAME} xmlcopyeditor.app/Contents/MacOS/xmlcopyeditor; done
+	for DYLIB in lib/libxml2.2 lib/libxslt.1 lib/libpcre.0 local/lib/libaspell.15 local/lib/libxerces-c-3.1 local/lib/libpng15.15 local/lib/libjpeg.8 local/lib/libtiff.5 lib/libexpat.1 lib/libz.1 lib/libiconv.2; do BASENAME=`basename /usr/$${DYLIB}.dylib`; echo "relinking $${BASENAME}"; cp /usr/$${DYLIB}.dylib xmlcopyeditor.app/Contents/Frameworks/; install_name_tool -change /usr/$${DYLIB}.dylib @executable_path/../Frameworks/$${BASENAME} xmlcopyeditor.app/Contents/MacOS/xmlcopyeditor; done
 	chmod +w xmlcopyeditor.app/Contents/Frameworks/*.dylib
 	#process libtiff
 	for DYLIB in local/lib/libjpeg.8 lib/libz.1; do BASENAME=`basename /usr/$${DYLIB}.dylib`; echo "relinking $${BASENAME}"; install_name_tool -change /usr/$${DYLIB}.dylib @executable_path/../Frameworks/$${BASENAME} xmlcopyeditor.app/Contents/Frameworks/libtiff.5.dylib; done
 	#process libxslt
 	for DYLIB in lib/libxml2.2; do BASENAME=`basename /usr/$${DYLIB}.dylib`; echo "relinking $${BASENAME}"; install_name_tool -change /usr/$${DYLIB}.dylib @executable_path/../Frameworks/$${BASENAME} xmlcopyeditor.app/Contents/Frameworks/libxslt.1.dylib; done
 	#process libxerces-c
-	for DYLIB in lib/libcurl.4; do BASENAME=`basename /usr/$${DYLIB}.dylib`; echo "relinking $${BASENAME}"; cp /usr/$${DYLIB}.dylib xmlcopyeditor.app/Contents/Frameworks/; install_name_tool -change /usr/$${DYLIB}.dylib @executable_path/../Frameworks/$${BASENAME} xmlcopyeditor.app/Contents/Frameworks/libxerces-c-3.2.dylib; done
+	for DYLIB in lib/libcurl.4; do BASENAME=`basename /usr/$${DYLIB}.dylib`; echo "relinking $${BASENAME}"; cp /usr/$${DYLIB}.dylib xmlcopyeditor.app/Contents/Frameworks/; install_name_tool -change /usr/$${DYLIB}.dylib @executable_path/../Frameworks/$${BASENAME} xmlcopyeditor.app/Contents/Frameworks/libxerces-c-3.1.dylib; done
 	#process libcurl
 	for DYLIB in lib/libcrypto.35 lib/libssl.35 lib/libapple_nghttp2; do BASENAME=`basename /usr/$${DYLIB}.dylib`; echo "relinking $${BASENAME}"; cp /usr/$${DYLIB}.dylib xmlcopyeditor.app/Contents/Frameworks/; install_name_tool -change /usr/$${DYLIB}.dylib @executable_path/../Frameworks/$${BASENAME} xmlcopyeditor.app/Contents/Frameworks/libcurl.4.dylib; done
 dmg:
--- 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/de.po
+++ b/po/de.po
@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: XMLCopyEditor\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/xml-copy-editor/bugs/\n"
 "POT-Creation-Date: 2014-06-01 20:46+0800\n"
-"PO-Revision-Date: 2019-11-16 15:23+0800\n"
+"PO-Revision-Date: 2007-03-15 00:36+0100\n"
 "Last-Translator: Thomas Wenzel <taaren@gmx.net>\n"
 "Language-Team: Thomas Wenzel <thowen@users.sourceforge.net>\n"
 "Language: de\n"
@ -1309,7 +1309,7 @@ msgid ""
 "Do you want to proceed?"
 msgstr ""
 "Datei wurde von einer anderen Anwendung geändert.\n"
-"Überschreiben?"
+"Erneut laden?"
 #: ../src/xmlcopyeditor.cpp:4547
 msgid "Confirmation"
--- a/po/en_US.gmo
+++ b/po/en_US.gmo
--- a/po/en_US.po
+++ b/po/en_US.po
--- 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
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -9,82 +9,32 @@ 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 \
+xmlcopyeditor_SOURCES = aboutdialog.cpp associatedialog.cpp binaryfile.cpp \
-	associatedialog.cpp \
+	casehandler.cpp catalogresolver.cpp commandpanel.cpp \
-	binaryfile.cpp \
+	contexthandler.cpp dtd2schema.cpp exportdialog.cpp \
-	casehandler.cpp \
+	findreplacepanel.cpp getword.cpp globalreplacedialog.cpp \
-	catalogresolver.cpp \
+	housestyle.cpp housestylereader.cpp housestylewriter.cpp \
-	commandpanel.cpp \
+	insertpanel.cpp locationpanel.cpp mp3album.cpp myhtmlpane.cpp \
-	contexthandler.cpp \
+	myipc.cpp mynotebook.cpp mypropertysheet.cpp nocasecompare.cpp \
-	dtd2schema.cpp \
+	pathresolver.cpp readfile.cpp replace.cpp rule.cpp styledialog.cpp \
-	exportdialog.cpp \
+	threadreaper.cpp validationthread.cpp wrapaspell.cpp wrapdaisy.cpp \
-	findreplacepanel.cpp \
+	wrapexpat.cpp wraplibxml.cpp wrapregex.cpp wraptempfilename.cpp \
-	getword.cpp \
+	wrapxerces.cpp xercescatalogresolver.cpp xmlassociatedtd.cpp \
-	globalreplacedialog.cpp \
+	xmlassociatexsd.cpp xmlassociatexsl.cpp xmlcopyeditor.cpp \
-	housestyle.cpp \
+	xmlcopyimg.cpp xmlctrl.cpp xmldoc.cpp xmlencodinghandler.cpp \
-	housestylereader.cpp \
+	xmlencodingspy.cpp xmlfilterreader.cpp xmlparseschemans.cpp \
-	housestylewriter.cpp \
+	xmlprodnote.cpp xmlpromptgenerator.cpp xmlrulereader.cpp \
-	insertpanel.cpp \
+	xmlschemagenerator.cpp xmlschemalocator.cpp xmlshallowvalidator.cpp \
-	locationpanel.cpp \
+	xmlsuppressprodnote.cpp xmltextinfo.cpp xmlutf8reader.cpp \
-	mp3album.cpp \
+	xmlwordcount.cpp xsllocator.cpp \
-	myhtmlpane.cpp \
+	xmlcopyeditor.spec xmlcopyeditor.png custom.xpm
 	myipc.cpp \
 	mynotebook.cpp \
 	mypropertysheet.cpp \
 	nocasecompare.cpp \
 	pathresolver.cpp \
 	readfile.cpp \
 	replace.cpp \
 	rule.cpp \
 	styledialog.cpp \
 	threadreaper.cpp \
 	validationthread.cpp \
 	wrapaspell.cpp \
 	wrapdaisy.cpp \
 	wrapexpat.cpp \
 	wraplibxml.cpp \
 	wrapregex.cpp \
 	wraptempfilename.cpp \
 	wrapxerces.cpp \
 	xercescatalogresolver.cpp \
 	xercesnetaccessor.cpp \
 	xmlassociatedtd.cpp \
 	xmlassociatexsd.cpp \
 	xmlassociatexsl.cpp \
 	xmlcopyeditor.cpp \
 	xmlcopyimg.cpp \
 	xmlctrl.cpp \
 	xmldoc.cpp \
 	xmlencodinghandler.cpp \
 	xmlencodingspy.cpp \
 	xmlfilterreader.cpp \
 	xmlparseschemans.cpp \
 	xmlprodnote.cpp \
 	xmlpromptgenerator.cpp \
 	xmlrulereader.cpp \
 	xmlschemagenerator.cpp \
 	xmlschemalocator.cpp \
 	xmlshallowvalidator.cpp \
 	xmlsuppressprodnote.cpp \
 	xmltextinfo.cpp \
 	xmlutf8reader.cpp \
 	xmlwordcount.cpp \
 	xsllocator.cpp \
 	xmlcopyeditor.spec \
 	xmlcopyeditor.png \
 	custom.xpm
 xmlcopyeditor_LDADD = $(WX_LIBS) \
-	$(ASPELL_LIBS) \
+	-lexpat -lxslt -lxml2 -lpcre -lxerces-c $(ASPELL_LIBS) $(ENCHANT_LIBS) $(GTK2_LIBS)
 	$(ENCHANT_LIBS) \
 	$(GTK_LIBS) \
 	$(XSLT_LIBS) \
 	$(PCRE2_LIBS) \
 	-lexpat -lxerces-c
 nobase_dist_xmlcopyeditor_DATA = $(srcdir)/catalog/catalog \
 	$(srcdir)/dtd/*.* \
@ -134,5 +84,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) $(GTK2_CFLAGS)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
 # Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@ -17,61 +18,6 @@
 VPATH = @srcdir@
 am__is_gnu_make = { \
  if test -z '$(MAKELEVEL)'; then \
    false; \
  elif test -n '$(MAKE_HOST)'; then \
    true; \
  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
    true; \
  else \
    false; \
  fi; \
 }
 am__make_running_with_option = \
  case $${target_option-} in \
      ?) ;; \
      *) echo "am__make_running_with_option: internal error: invalid" \
              "target option '$${target_option-}' specified" >&2; \
         exit 1;; \
  esac; \
  has_opt=no; \
  sane_makeflags=$$MAKEFLAGS; \
  if $(am__is_gnu_make); then \
    sane_makeflags=$$MFLAGS; \
  else \
    case $$MAKEFLAGS in \
      *\\[\ \	]*) \
        bs=\\; \
        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
    esac; \
  fi; \
  skip_next=no; \
  strip_trailopt () \
  { \
    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
  }; \
  for flg in $$sane_makeflags; do \
    test $$skip_next = yes && { skip_next=no; continue; }; \
    case $$flg in \
      *=*|--*) continue;; \
        -*I) strip_trailopt 'I'; skip_next=yes;; \
      -*I?*) strip_trailopt 'I';; \
        -*O) strip_trailopt 'O'; skip_next=yes;; \
      -*O?*) strip_trailopt 'O';; \
        -*l) strip_trailopt 'l'; skip_next=yes;; \
      -*l?*) strip_trailopt 'l';; \
      -[dEDm]) skip_next=yes;; \
      -[JT]) skip_next=yes;; \
    esac; \
    case $$flg in \
      *$$target_option*) has_opt=yes; break;; \
    esac; \
  done; \
  test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@ -92,16 +38,12 @@ build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = xmlcopyeditor$(EXEEXT)
 subdir = src
 DIST_COMMON = $(nobase_dist_xmlcopyeditor_DATA) $(noinst_HEADERS) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(nobase_dist_xmlcopyeditor_DATA) \
 	$(noinst_HEADERS) $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@ -126,102 +68,37 @@ am_xmlcopyeditor_OBJECTS = aboutdialog.$(OBJEXT) \
 	wrapdaisy.$(OBJEXT) wrapexpat.$(OBJEXT) wraplibxml.$(OBJEXT) \
 	wrapregex.$(OBJEXT) wraptempfilename.$(OBJEXT) \
 	wrapxerces.$(OBJEXT) xercescatalogresolver.$(OBJEXT) \
-	xercesnetaccessor.$(OBJEXT) xmlassociatedtd.$(OBJEXT) \
+	xmlassociatedtd.$(OBJEXT) xmlassociatexsd.$(OBJEXT) \
-	xmlassociatexsd.$(OBJEXT) xmlassociatexsl.$(OBJEXT) \
+	xmlassociatexsl.$(OBJEXT) xmlcopyeditor.$(OBJEXT) \
-	xmlcopyeditor.$(OBJEXT) xmlcopyimg.$(OBJEXT) xmlctrl.$(OBJEXT) \
+	xmlcopyimg.$(OBJEXT) xmlctrl.$(OBJEXT) xmldoc.$(OBJEXT) \
-	xmldoc.$(OBJEXT) xmlencodinghandler.$(OBJEXT) \
+	xmlencodinghandler.$(OBJEXT) xmlencodingspy.$(OBJEXT) \
-	xmlencodingspy.$(OBJEXT) xmlfilterreader.$(OBJEXT) \
+	xmlfilterreader.$(OBJEXT) xmlparseschemans.$(OBJEXT) \
-	xmlparseschemans.$(OBJEXT) xmlprodnote.$(OBJEXT) \
+	xmlprodnote.$(OBJEXT) xmlpromptgenerator.$(OBJEXT) \
-	xmlpromptgenerator.$(OBJEXT) xmlrulereader.$(OBJEXT) \
+	xmlrulereader.$(OBJEXT) xmlschemagenerator.$(OBJEXT) \
-	xmlschemagenerator.$(OBJEXT) xmlschemalocator.$(OBJEXT) \
+	xmlschemalocator.$(OBJEXT) xmlshallowvalidator.$(OBJEXT) \
-	xmlshallowvalidator.$(OBJEXT) xmlsuppressprodnote.$(OBJEXT) \
+	xmlsuppressprodnote.$(OBJEXT) xmltextinfo.$(OBJEXT) \
-	xmltextinfo.$(OBJEXT) xmlutf8reader.$(OBJEXT) \
+	xmlutf8reader.$(OBJEXT) xmlwordcount.$(OBJEXT) \
-	xmlwordcount.$(OBJEXT) xsllocator.$(OBJEXT)
+	xsllocator.$(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@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
 am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
 am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 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)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 	$(AM_CXXFLAGS) $(CXXFLAGS)
 AM_V_CXX = $(am__v_CXX_@AM_V@)
 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
 am__v_CXX_0 = @echo "  CXX     " $@;
 am__v_CXX_1 = 
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+	$(LDFLAGS) -o $@
 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
 am__v_CXXLD_0 = @echo "  CXXLD   " $@;
 am__v_CXXLD_1 = 
 SOURCES = $(xmlcopyeditor_SOURCES)
 DIST_SOURCES = $(xmlcopyeditor_SOURCES)
 am__can_run_installinfo = \
  case $$AM_UPDATE_INFO_DIR in \
    n|no|NO) false;; \
    *) (install-info --version) >/dev/null 2>&1;; \
  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@ -251,24 +128,8 @@ am__uninstall_files_from_dir = { \
  }
 DATA = $(nobase_dist_xmlcopyeditor_DATA) $(pixmap_DATA)
 HEADERS = $(noinst_HEADERS)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ETAGS = etags
-# Read a list of newline-separated strings from the standard input,
+CTAGS = ctags
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
 am__uniquify_input = $(AWK) '\
  BEGIN { nonempty = 0; } \
  { items[$$0] = 1; nonempty = 1; } \
  END { if (nonempty) { for (i in items) print i; }; } \
 '
 # Make sure the list of sources is unique.  This is necessary because,
 # e.g., the same source file might be shared among _SOURCES variables
 # for different programs/libraries.
 am__define_uniq_tagged_files = \
  list='$(am__tagged_files)'; \
  unique=`for i in $$list; do \
    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  done | $(am__uniquify_input)`
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@ -284,14 +145,14 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CSCOPE = @CSCOPE@
 CTAGS = @CTAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
@ -304,14 +165,13 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 ENCHANT_CFLAGS = @ENCHANT_CFLAGS@
 ENCHANT_LIBS = @ENCHANT_LIBS@
 ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK2_CFLAGS = @GTK2_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
+GTK2_LIBS = @GTK2_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@ -333,7 +193,6 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@ -353,8 +212,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 +224,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@
@ -418,7 +271,6 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@ -431,82 +283,32 @@ 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
-xmlcopyeditor_SOURCES = aboutdialog.cpp \
+xmlcopyeditor_SOURCES = aboutdialog.cpp associatedialog.cpp binaryfile.cpp \
-	associatedialog.cpp \
+	casehandler.cpp catalogresolver.cpp commandpanel.cpp \
-	binaryfile.cpp \
+	contexthandler.cpp dtd2schema.cpp exportdialog.cpp \
-	casehandler.cpp \
+	findreplacepanel.cpp getword.cpp globalreplacedialog.cpp \
-	catalogresolver.cpp \
+	housestyle.cpp housestylereader.cpp housestylewriter.cpp \
-	commandpanel.cpp \
+	insertpanel.cpp locationpanel.cpp mp3album.cpp myhtmlpane.cpp \
-	contexthandler.cpp \
+	myipc.cpp mynotebook.cpp mypropertysheet.cpp nocasecompare.cpp \
-	dtd2schema.cpp \
+	pathresolver.cpp readfile.cpp replace.cpp rule.cpp styledialog.cpp \
-	exportdialog.cpp \
+	threadreaper.cpp validationthread.cpp wrapaspell.cpp wrapdaisy.cpp \
-	findreplacepanel.cpp \
+	wrapexpat.cpp wraplibxml.cpp wrapregex.cpp wraptempfilename.cpp \
-	getword.cpp \
+	wrapxerces.cpp xercescatalogresolver.cpp xmlassociatedtd.cpp \
-	globalreplacedialog.cpp \
+	xmlassociatexsd.cpp xmlassociatexsl.cpp xmlcopyeditor.cpp \
-	housestyle.cpp \
+	xmlcopyimg.cpp xmlctrl.cpp xmldoc.cpp xmlencodinghandler.cpp \
-	housestylereader.cpp \
+	xmlencodingspy.cpp xmlfilterreader.cpp xmlparseschemans.cpp \
-	housestylewriter.cpp \
+	xmlprodnote.cpp xmlpromptgenerator.cpp xmlrulereader.cpp \
-	insertpanel.cpp \
+	xmlschemagenerator.cpp xmlschemalocator.cpp xmlshallowvalidator.cpp \
-	locationpanel.cpp \
+	xmlsuppressprodnote.cpp xmltextinfo.cpp xmlutf8reader.cpp \
-	mp3album.cpp \
+	xmlwordcount.cpp xsllocator.cpp \
-	myhtmlpane.cpp \
+	xmlcopyeditor.spec xmlcopyeditor.png custom.xpm
 	myipc.cpp \
 	mynotebook.cpp \
 	mypropertysheet.cpp \
 	nocasecompare.cpp \
 	pathresolver.cpp \
 	readfile.cpp \
 	replace.cpp \
 	rule.cpp \
 	styledialog.cpp \
 	threadreaper.cpp \
 	validationthread.cpp \
 	wrapaspell.cpp \
 	wrapdaisy.cpp \
 	wrapexpat.cpp \
 	wraplibxml.cpp \
 	wrapregex.cpp \
 	wraptempfilename.cpp \
 	wrapxerces.cpp \
 	xercescatalogresolver.cpp \
 	xercesnetaccessor.cpp \
 	xmlassociatedtd.cpp \
 	xmlassociatexsd.cpp \
 	xmlassociatexsl.cpp \
 	xmlcopyeditor.cpp \
 	xmlcopyimg.cpp \
 	xmlctrl.cpp \
 	xmldoc.cpp \
 	xmlencodinghandler.cpp \
 	xmlencodingspy.cpp \
 	xmlfilterreader.cpp \
 	xmlparseschemans.cpp \
 	xmlprodnote.cpp \
 	xmlpromptgenerator.cpp \
 	xmlrulereader.cpp \
 	xmlschemagenerator.cpp \
 	xmlschemalocator.cpp \
 	xmlshallowvalidator.cpp \
 	xmlsuppressprodnote.cpp \
 	xmltextinfo.cpp \
 	xmlutf8reader.cpp \
 	xmlwordcount.cpp \
 	xsllocator.cpp \
 	xmlcopyeditor.spec \
 	xmlcopyeditor.png \
 	custom.xpm
 xmlcopyeditor_LDADD = $(WX_LIBS) \
-	$(ASPELL_LIBS) \
+	-lexpat -lxslt -lxml2 -lpcre -lxerces-c $(ASPELL_LIBS) $(ENCHANT_LIBS) $(GTK2_LIBS)
 	$(ENCHANT_LIBS) \
 	$(GTK_LIBS) \
 	$(XSLT_LIBS) \
 	$(PCRE2_LIBS) \
 	-lexpat -lxerces-c
 nobase_dist_xmlcopyeditor_DATA = $(srcdir)/catalog/catalog \
 	$(srcdir)/dtd/*.* \
@ -555,7 +357,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) $(GTK2_CFLAGS)
 all: all-am
 .SUFFIXES:
@ -572,13 +374,14 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__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)
@ -591,19 +394,14 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	if test -n "$$list"; then \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
 	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p \
+	while read p p1; do if test -f $$p || test -f $$p1; \
-	 || test -f $$p1 \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
 	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
 	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@ -624,8 +422,7 @@ uninstall-binPROGRAMS:
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' \
+	      -e 's/$$/$(EXEEXT)/' `; \
 	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@ -638,10 +435,9 @@ clean-binPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
 xmlcopyeditor$(EXEEXT): $(xmlcopyeditor_OBJECTS) $(xmlcopyeditor_DEPENDENCIES) $(EXTRA_xmlcopyeditor_DEPENDENCIES) 
 	@rm -f xmlcopyeditor$(EXEEXT)
-	$(AM_V_CXXLD)$(CXXLINK) $(xmlcopyeditor_OBJECTS) $(xmlcopyeditor_LDADD) $(LIBS)
+	$(CXXLINK) $(xmlcopyeditor_OBJECTS) $(xmlcopyeditor_LDADD) $(LIBS)
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@ -649,94 +445,87 @@ 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)/xmlassociatedtd.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlassociatedtd.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlassociatexsd.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlassociatexsd.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlassociatexsl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlassociatexsl.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlcopyeditor.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlcopyeditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlcopyimg.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlcopyimg.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlctrl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlctrl.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmldoc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmldoc.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlencodinghandler.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlencodinghandler.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlencodingspy.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlencodingspy.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlfilterreader.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlfilterreader.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlparseschemans.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlparseschemans.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlprodnote.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlprodnote.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlpromptgenerator.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlpromptgenerator.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlrulereader.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlrulereader.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlschemagenerator.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlschemagenerator.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlschemalocator.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlschemalocator.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlshallowvalidator.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlshallowvalidator.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlsuppressprodnote.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlsuppressprodnote.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmltextinfo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmltextinfo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlutf8reader.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlutf8reader.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlwordcount.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlwordcount.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsllocator.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsllocator.Po@am__quote@ # am--include-marker
 $(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 $@ $<
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 .cpp.obj:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 .cpp.lo:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 mostlyclean-libtool:
 	-rm -f *.lo
@ -745,18 +534,15 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-nobase_dist_xmlcopyeditorDATA: $(nobase_dist_xmlcopyeditor_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(xmlcopyeditordir)" || $(MKDIR_P) "$(DESTDIR)$(xmlcopyeditordir)"
 	@list='$(nobase_dist_xmlcopyeditor_DATA)'; test -n "$(xmlcopyeditordir)" || list=; \
 	if test -n "$$list"; then \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(xmlcopyeditordir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(xmlcopyeditordir)" || exit 1; \
 	fi; \
 	$(am__nobase_list) | while read dir files; do \
 	  xfiles=; for file in $$files; do \
 	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
 	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
 	  test -z "$$xfiles" || { \
 	    test "x$$dir" = x. || { \
-	      echo " $(MKDIR_P) '$(DESTDIR)$(xmlcopyeditordir)/$$dir'"; \
+	      echo "$(MKDIR_P) '$(DESTDIR)$(xmlcopyeditordir)/$$dir'"; \
 	      $(MKDIR_P) "$(DESTDIR)$(xmlcopyeditordir)/$$dir"; }; \
 	    echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(xmlcopyeditordir)/$$dir'"; \
 	    $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(xmlcopyeditordir)/$$dir" || exit $$?; }; \
@ -769,11 +555,8 @@ uninstall-nobase_dist_xmlcopyeditorDATA:
 	dir='$(DESTDIR)$(xmlcopyeditordir)'; $(am__uninstall_files_from_dir)
 install-pixmapDATA: $(pixmap_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(pixmapdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapdir)"
 	@list='$(pixmap_DATA)'; test -n "$(pixmapdir)" || list=; \
 	if test -n "$$list"; then \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(pixmapdir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(pixmapdir)" || exit 1; \
 	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@ -789,15 +572,26 @@ uninstall-pixmapDATA:
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(pixmapdir)'; $(am__uninstall_files_from_dir)
-ID: $(am__tagged_files)
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-tags: tags-am
+	unique=`for i in $$list; do \
-TAGS: tags
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	set x; \
 	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@ -809,11 +603,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	      $$unique; \
 	  fi; \
 	fi
-ctags: ctags-am
+ctags: CTAGS
-
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-CTAGS: ctags
+		$(TAGS_FILES) $(LISP)
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	$(am__define_uniq_tagged_files); \
+	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@ -822,28 +620,11 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 cscopelist: cscopelist-am
 cscopelist-am: $(am__tagged_files)
 	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
 	esac; \
 	for i in $$list; do \
 	  if test -f "$$i"; then \
 	    echo "$(subdir)/$$i"; \
 	  else \
 	    echo "$$sdir/$$i"; \
 	  fi; \
 	done >> $(top_builddir)/cscope.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 +696,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 +743,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,25 +765,22 @@ 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 all all-am check check-am clean clean-binPROGRAMS \
-	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
+	clean-generic clean-libtool ctags distclean distclean-compile \
-	ctags ctags-am distclean distclean-compile distclean-generic \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	dvi-am html html-am info info-am install install-am \
-	html-am info info-am install install-am install-binPROGRAMS \
+	install-binPROGRAMS install-data install-data-am install-dvi \
-	install-data install-data-am install-dvi install-dvi-am \
+	install-dvi-am install-exec install-exec-am install-html \
-	install-exec install-exec-am install-html install-html-am \
+	install-html-am install-info install-info-am install-man \
 	install-info install-info-am install-man \
 	install-nobase_dist_xmlcopyeditorDATA install-pdf \
 	install-pdf-am install-pixmapDATA install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
 	uninstall-binPROGRAMS uninstall-nobase_dist_xmlcopyeditorDATA \
 	uninstall-pixmapDATA
 .PRECIOUS: Makefile
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- 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/associatedialog.cpp
+++ b/src/associatedialog.cpp
@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 #include "associatedialog.h"
 #include "wraplibxml.h"
@ -168,7 +168,7 @@ void AssociateDialog::OnBrowse ( wxCommandEvent& e )
 	wxString dir = fileName.GetPath();
 	if ( dir.empty() && mLastDir )
 		dir = *mLastDir;
-	boost::scoped_ptr<wxFileDialog> fd ( new wxFileDialog (
+	std::auto_ptr<wxFileDialog> fd ( new wxFileDialog (
 	                                     this,
 	                                     _ ( "Select " ) + type,
 	                                     dir,
--- a/src/bin/doc2xml.exe
+++ b/src/bin/doc2xml.exe
--- a/src/bin/xml2doc.exe
+++ b/src/bin/xml2doc.exe
--- a/src/bmp/stock_print.bmp
+++ b/src/bmp/stock_print.bmp
--- a/src/bmp/stock_save.bmp
+++ b/src/bmp/stock_save.bmp
--- a/src/bmp/stock_spellcheck.bmp
+++ b/src/bmp/stock_spellcheck.bmp
--- a/src/casehandler.h
+++ b/src/casehandler.h
@ -23,7 +23,7 @@
 #include <string>
-using std::string;
+using namespace std;
 class CaseHandler
 {
--- a/src/catalogresolver.cpp
+++ b/src/catalogresolver.cpp
@ -18,6 +18,7 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include <memory>
 #include "catalogresolver.h"
 CatalogResolver::CatalogResolver()
@ -32,5 +33,6 @@ wxString CatalogResolver::catalogResolve (
    const wxString &publicId,
    const wxString &systemId )
 {
 	//std::auto_ptr<WrapLibxml> libxml ( new WrapLibxml ( false, catalogPath ) );
 	return WrapLibxml::catalogResolve ( publicId, systemId );
 }
--- 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"
@ -136,7 +135,7 @@ CommandPanel::CommandPanel (
 	bottomSizer->Add ( outputSizer, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, sizerOffset );
 	mainSizer = new wxBoxSizer ( wxVERTICAL );
-	mainSizer->Add ( commandEdit, 0, wxLEFT | wxRIGHT | wxEXPAND, sizerOffset );
+	mainSizer->Add ( commandEdit, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL | wxEXPAND, sizerOffset );
 	mainSizer->Add ( bottomSizer );
--- a/src/contexthandler.h
+++ b/src/contexthandler.h
@ -23,7 +23,7 @@
 #include <string>
-using std::string;
+using namespace std;
 class ContextMatch
 {
--- 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`