diff --git a/.gitignore b/.gitignore
index a5b9513e..a22d1e37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-xarchiver-0.5.2.tar.bz2
-/xarchiver-0.5.4.tar.bz2
-/0.5.4.14.tar.gz
+/xarchiver-*.tar.bz2
+/xarchiver-*.tar.gz
+/0.5.4.*.tar.gz
diff --git a/0001-Update-GNU-Build-System.patch b/0001-Update-GNU-Build-System.patch
deleted file mode 100644
index ec03d486..00000000
--- a/0001-Update-GNU-Build-System.patch
+++ /dev/null
@@ -1,1356 +0,0 @@
-From cd3f297e7f6a760b9c81cff0c3eb9b6fdee05526 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ingo=20Br=C3=BCckl?= <ib@wupperonline.de>
-Date: Thu, 6 Jun 2019 13:15:47 +0200
-Subject: [PATCH] Update GNU Build System
-
-Enable usage of outdated building tools.
----
- Makefile.in                |   8 +-
- autogen.sh                 |   1 +
- configure                  | 986 +++++--------------------------------
- configure.ac               |   6 +-
- doc/Makefile.in            |   8 +-
- icons/16x16/Makefile.in    |   8 +-
- icons/24x24/Makefile.in    |   8 +-
- icons/48x48/Makefile.in    |   8 +-
- icons/Makefile.in          |   8 +-
- icons/scalable/Makefile.in |   8 +-
- pixmaps/Makefile.in        |   8 +-
- src/Makefile.in            |   8 +-
- src/xdgmime/Makefile.in    |   8 +-
- 13 files changed, 173 insertions(+), 900 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 82e3354..1ece1f7 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -91,10 +91,10 @@ build_triplet = @build@
- host_triplet = @host@
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(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)/configure.ac
-+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
-+	$(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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
-diff --git a/autogen.sh b/autogen.sh
-index 8fc5858..0a1f496 100755
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -4,6 +4,7 @@ test "$BASH" && set -o pipefail
- 
- echo > AUTHORS
- echo > NEWS
-+mkdir m4
- 
- echo -n "Creating the build system... "
- 
-diff --git a/configure b/configure
-index ccabec8..ead170f 100755
---- a/configure
-+++ b/configure
-@@ -790,6 +790,9 @@ LIBTOOL
- EGREP
- GREP
- CPP
-+MAINT
-+MAINTAINER_MODE_FALSE
-+MAINTAINER_MODE_TRUE
- am__fastdepCC_FALSE
- am__fastdepCC_TRUE
- CCDEPMODE
-@@ -806,9 +809,6 @@ CPPFLAGS
- LDFLAGS
- CFLAGS
- CC
--MAINT
--MAINTAINER_MODE_FALSE
--MAINTAINER_MODE_TRUE
- AM_BACKSLASH
- AM_DEFAULT_VERBOSITY
- AM_DEFAULT_V
-@@ -887,8 +887,8 @@ ac_subst_files=''
- ac_user_opts='
- enable_option_checking
- enable_silent_rules
--enable_maintainer_mode
- enable_dependency_tracking
-+enable_maintainer_mode
- enable_static
- enable_shared
- with_pic
-@@ -1541,13 +1541,13 @@ Optional Features:
-   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-   --enable-silent-rules   less verbose build output (undo: "make V=1")
-   --disable-silent-rules  verbose build output (undo: "make V=0")
--  --enable-maintainer-mode
--                          enable make rules and dependencies not useful (and
--                          sometimes confusing) to the casual installer
-   --enable-dependency-tracking
-                           do not reject slow dependency extractors
-   --disable-dependency-tracking
-                           speeds up one-time build
-+  --enable-maintainer-mode
-+                          enable make rules and dependencies not useful (and
-+                          sometimes confusing) to the casual installer
-   --enable-static[=PKGS]  build static libraries [default=no]
-   --enable-shared[=PKGS]  build shared libraries [default=yes]
-   --enable-fast-install[=PKGS]
-@@ -2387,6 +2387,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- : ${CFLAGS="-O2"}
- 
-+ac_config_headers="$ac_config_headers config.h"
-+
- 
- ac_aux_dir=
- for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-@@ -3068,71 +3070,6 @@ END
-   fi
- fi
- 
--ac_config_headers="$ac_config_headers config.h"
--
--# Check whether --enable-silent-rules was given.
--if test "${enable_silent_rules+set}" = set; then :
--  enableval=$enable_silent_rules;
--fi
--
--case $enable_silent_rules in # (((
--  yes) AM_DEFAULT_VERBOSITY=0;;
--   no) AM_DEFAULT_VERBOSITY=1;;
--    *) AM_DEFAULT_VERBOSITY=0;;
--esac
--am_make=${MAKE-make}
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
--$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
--if ${am_cv_make_support_nested_variables+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  if $as_echo 'TRUE=$(BAR$(V))
--BAR0=false
--BAR1=true
--V=1
--am__doit:
--	@$(TRUE)
--.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
--  am_cv_make_support_nested_variables=yes
--else
--  am_cv_make_support_nested_variables=no
--fi
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
--$as_echo "$am_cv_make_support_nested_variables" >&6; }
--if test $am_cv_make_support_nested_variables = yes; then
--    AM_V='$(V)'
--  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
--else
--  AM_V=$AM_DEFAULT_VERBOSITY
--  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
--fi
--AM_BACKSLASH='\'
--
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
--$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
--    # Check whether --enable-maintainer-mode was given.
--if test "${enable_maintainer_mode+set}" = set; then :
--  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
--else
--  USE_MAINTAINER_MODE=no
--fi
--
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
--$as_echo "$USE_MAINTAINER_MODE" >&6; }
--   if test $USE_MAINTAINER_MODE = yes; then
--  MAINTAINER_MODE_TRUE=
--  MAINTAINER_MODE_FALSE='#'
--else
--  MAINTAINER_MODE_TRUE='#'
--  MAINTAINER_MODE_FALSE=
--fi
--
--  MAINT=$MAINTAINER_MODE_TRUE
--
--
--
- DEPDIR="${am__leading_dot}deps"
- 
- ac_config_commands="$ac_config_commands depfiles"
-@@ -4173,6 +4110,70 @@ fi
- 
- 
- 
-+# Check whether --enable-silent-rules was given.
-+if test "${enable_silent_rules+set}" = set; then :
-+  enableval=$enable_silent_rules;
-+fi
-+
-+case $enable_silent_rules in # (((
-+  yes) AM_DEFAULT_VERBOSITY=0;;
-+   no) AM_DEFAULT_VERBOSITY=1;;
-+    *) AM_DEFAULT_VERBOSITY=0;;
-+esac
-+am_make=${MAKE-make}
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
-+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
-+if ${am_cv_make_support_nested_variables+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if $as_echo 'TRUE=$(BAR$(V))
-+BAR0=false
-+BAR1=true
-+V=1
-+am__doit:
-+	@$(TRUE)
-+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
-+  am_cv_make_support_nested_variables=yes
-+else
-+  am_cv_make_support_nested_variables=no
-+fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-+$as_echo "$am_cv_make_support_nested_variables" >&6; }
-+if test $am_cv_make_support_nested_variables = yes; then
-+    AM_V='$(V)'
-+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-+else
-+  AM_V=$AM_DEFAULT_VERBOSITY
-+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-+fi
-+AM_BACKSLASH='\'
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-+    # Check whether --enable-maintainer-mode was given.
-+if test "${enable_maintainer_mode+set}" = set; then :
-+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-+else
-+  USE_MAINTAINER_MODE=no
-+fi
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
-+$as_echo "$USE_MAINTAINER_MODE" >&6; }
-+   if test $USE_MAINTAINER_MODE = yes; then
-+  MAINTAINER_MODE_TRUE=
-+  MAINTAINER_MODE_FALSE='#'
-+else
-+  MAINTAINER_MODE_TRUE='#'
-+  MAINTAINER_MODE_FALSE=
-+fi
-+
-+  MAINT=$MAINTAINER_MODE_TRUE
-+
-+
-+
-+
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4549,641 +4550,59 @@ fi
- $as_echo "$ac_cv_header_stdc" >&6; }
- if test $ac_cv_header_stdc = yes; then
- 
--$as_echo "#define STDC_HEADERS 1" >>confdefs.h
--
--fi
--
--# On IRIX 5.3, sys/types and inttypes.h are conflicting.
--for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
--		  inttypes.h stdint.h unistd.h
--do :
--  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
--"
--if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
--  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--
--done
--
--
--
--  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
--if test "x$ac_cv_header_minix_config_h" = xyes; then :
--  MINIX=yes
--else
--  MINIX=
--fi
--
--
--  if test "$MINIX" = yes; then
--
--$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
--
--
--$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
--
--
--$as_echo "#define _MINIX 1" >>confdefs.h
--
--  fi
--
--
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
--$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
--if ${ac_cv_safe_to_define___extensions__+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--#         define __EXTENSIONS__ 1
--          $ac_includes_default
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
--  ac_cv_safe_to_define___extensions__=yes
--else
--  ac_cv_safe_to_define___extensions__=no
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
--$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
--  test $ac_cv_safe_to_define___extensions__ = yes &&
--    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
--
--  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
--
--  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
--
--  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
--
--  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
--
--
--
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
--set dummy ${ac_tool_prefix}gcc; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_prog_CC+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  if test -n "$CC"; then
--  ac_cv_prog_CC="$CC" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_exec_ext in '' $ac_executable_extensions; do
--  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_CC="${ac_tool_prefix}gcc"
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--fi
--fi
--CC=$ac_cv_prog_CC
--if test -n "$CC"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
--$as_echo "$CC" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--fi
--if test -z "$ac_cv_prog_CC"; then
--  ac_ct_CC=$CC
--  # Extract the first word of "gcc", so it can be a program name with args.
--set dummy gcc; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_prog_ac_ct_CC+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  if test -n "$ac_ct_CC"; then
--  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_exec_ext in '' $ac_executable_extensions; do
--  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_ac_ct_CC="gcc"
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--fi
--fi
--ac_ct_CC=$ac_cv_prog_ac_ct_CC
--if test -n "$ac_ct_CC"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
--$as_echo "$ac_ct_CC" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--  if test "x$ac_ct_CC" = x; then
--    CC=""
--  else
--    case $cross_compiling:$ac_tool_warned in
--yes:)
--{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
--ac_tool_warned=yes ;;
--esac
--    CC=$ac_ct_CC
--  fi
--else
--  CC="$ac_cv_prog_CC"
--fi
--
--if test -z "$CC"; then
--          if test -n "$ac_tool_prefix"; then
--    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
--set dummy ${ac_tool_prefix}cc; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_prog_CC+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  if test -n "$CC"; then
--  ac_cv_prog_CC="$CC" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_exec_ext in '' $ac_executable_extensions; do
--  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_CC="${ac_tool_prefix}cc"
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--fi
--fi
--CC=$ac_cv_prog_CC
--if test -n "$CC"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
--$as_echo "$CC" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--  fi
--fi
--if test -z "$CC"; then
--  # Extract the first word of "cc", so it can be a program name with args.
--set dummy cc; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_prog_CC+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  if test -n "$CC"; then
--  ac_cv_prog_CC="$CC" # Let the user override the test.
--else
--  ac_prog_rejected=no
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_exec_ext in '' $ac_executable_extensions; do
--  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
--       ac_prog_rejected=yes
--       continue
--     fi
--    ac_cv_prog_CC="cc"
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--if test $ac_prog_rejected = yes; then
--  # We found a bogon in the path, so make sure we never use it.
--  set dummy $ac_cv_prog_CC
--  shift
--  if test $# != 0; then
--    # We chose a different compiler from the bogus one.
--    # However, it has the same basename, so the bogon will be chosen
--    # first if we set CC to just the basename; use the full file name.
--    shift
--    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
--  fi
--fi
--fi
--fi
--CC=$ac_cv_prog_CC
--if test -n "$CC"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
--$as_echo "$CC" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--fi
--if test -z "$CC"; then
--  if test -n "$ac_tool_prefix"; then
--  for ac_prog in cl.exe
--  do
--    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
--set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_prog_CC+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  if test -n "$CC"; then
--  ac_cv_prog_CC="$CC" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_exec_ext in '' $ac_executable_extensions; do
--  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--fi
--fi
--CC=$ac_cv_prog_CC
--if test -n "$CC"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
--$as_echo "$CC" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--    test -n "$CC" && break
--  done
--fi
--if test -z "$CC"; then
--  ac_ct_CC=$CC
--  for ac_prog in cl.exe
--do
--  # Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_prog_ac_ct_CC+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  if test -n "$ac_ct_CC"; then
--  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_exec_ext in '' $ac_executable_extensions; do
--  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_ac_ct_CC="$ac_prog"
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--fi
--fi
--ac_ct_CC=$ac_cv_prog_ac_ct_CC
--if test -n "$ac_ct_CC"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
--$as_echo "$ac_ct_CC" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--  test -n "$ac_ct_CC" && break
--done
--
--  if test "x$ac_ct_CC" = x; then
--    CC=""
--  else
--    case $cross_compiling:$ac_tool_warned in
--yes:)
--{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
--ac_tool_warned=yes ;;
--esac
--    CC=$ac_ct_CC
--  fi
--fi
--
--fi
--
--
--test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "no acceptable C compiler found in \$PATH
--See \`config.log' for more details" "$LINENO" 5; }
--
--# Provide some information about the compiler.
--$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
--set X $ac_compile
--ac_compiler=$2
--for ac_option in --version -v -V -qversion; do
--  { { ac_try="$ac_compiler $ac_option >&5"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--$as_echo "$ac_try_echo"; } >&5
--  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
--  ac_status=$?
--  if test -s conftest.err; then
--    sed '10a\
--... rest of stderr output deleted ...
--         10q' conftest.err >conftest.er1
--    cat conftest.er1 >&5
--  fi
--  rm -f conftest.er1 conftest.err
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }
--done
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
--$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
--if ${ac_cv_c_compiler_gnu+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--int
--main ()
--{
--#ifndef __GNUC__
--       choke me
--#endif
--
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
--  ac_compiler_gnu=yes
--else
--  ac_compiler_gnu=no
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--ac_cv_c_compiler_gnu=$ac_compiler_gnu
--
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
--$as_echo "$ac_cv_c_compiler_gnu" >&6; }
--if test $ac_compiler_gnu = yes; then
--  GCC=yes
--else
--  GCC=
--fi
--ac_test_CFLAGS=${CFLAGS+set}
--ac_save_CFLAGS=$CFLAGS
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
--$as_echo_n "checking whether $CC accepts -g... " >&6; }
--if ${ac_cv_prog_cc_g+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  ac_save_c_werror_flag=$ac_c_werror_flag
--   ac_c_werror_flag=yes
--   ac_cv_prog_cc_g=no
--   CFLAGS="-g"
--   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
--  ac_cv_prog_cc_g=yes
--else
--  CFLAGS=""
--      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
--
--else
--  ac_c_werror_flag=$ac_save_c_werror_flag
--	 CFLAGS="-g"
--	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
--  ac_cv_prog_cc_g=yes
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--   ac_c_werror_flag=$ac_save_c_werror_flag
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
--$as_echo "$ac_cv_prog_cc_g" >&6; }
--if test "$ac_test_CFLAGS" = set; then
--  CFLAGS=$ac_save_CFLAGS
--elif test $ac_cv_prog_cc_g = yes; then
--  if test "$GCC" = yes; then
--    CFLAGS="-g -O2"
--  else
--    CFLAGS="-g"
--  fi
--else
--  if test "$GCC" = yes; then
--    CFLAGS="-O2"
--  else
--    CFLAGS=
--  fi
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
--$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
--if ${ac_cv_prog_cc_c89+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  ac_cv_prog_cc_c89=no
--ac_save_CC=$CC
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <stdarg.h>
--#include <stdio.h>
--struct stat;
--/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
--struct buf { int x; };
--FILE * (*rcsopen) (struct buf *, struct stat *, int);
--static char *e (p, i)
--     char **p;
--     int i;
--{
--  return p[i];
--}
--static char *f (char * (*g) (char **, int), char **p, ...)
--{
--  char *s;
--  va_list v;
--  va_start (v,p);
--  s = g (p, va_arg (v,int));
--  va_end (v);
--  return s;
--}
--
--/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
--   function prototypes and stuff, but not '\xHH' hex character constants.
--   These don't provoke an error unfortunately, instead are silently treated
--   as 'x'.  The following induces an error, until -std is added to get
--   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
--   array size at least.  It's necessary to write '\x00'==0 to get something
--   that's true only with -std.  */
--int osf4_cc_array ['\x00' == 0 ? 1 : -1];
--
--/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
--   inside strings and character constants.  */
--#define FOO(x) 'x'
--int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
--
--int test (int i, double x);
--struct s1 {int (*f) (int a);};
--struct s2 {int (*f) (double a);};
--int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
--int argc;
--char **argv;
--int
--main ()
--{
--return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
--  ;
--  return 0;
--}
-+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-+
-+fi
-+
-+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-+		  inttypes.h stdint.h unistd.h
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-+"
-+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
--for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
--	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
--do
--  CC="$ac_save_CC $ac_arg"
--  if ac_fn_c_try_compile "$LINENO"; then :
--  ac_cv_prog_cc_c89=$ac_arg
-+
- fi
--rm -f core conftest.err conftest.$ac_objext
--  test "x$ac_cv_prog_cc_c89" != "xno" && break
-+
- done
--rm -f conftest.$ac_ext
--CC=$ac_save_CC
- 
--fi
--# AC_CACHE_VAL
--case "x$ac_cv_prog_cc_c89" in
--  x)
--    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
--$as_echo "none needed" >&6; } ;;
--  xno)
--    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
--$as_echo "unsupported" >&6; } ;;
--  *)
--    CC="$CC $ac_cv_prog_cc_c89"
--    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
--$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
--esac
--if test "x$ac_cv_prog_cc_c89" != xno; then :
- 
-+
-+  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-+if test "x$ac_cv_header_minix_config_h" = xyes; then :
-+  MINIX=yes
-+else
-+  MINIX=
- fi
- 
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
--$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
--if ${am_cv_prog_cc_c_o+:} false; then :
-+  if test "$MINIX" = yes; then
-+
-+$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
-+
-+
-+$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
-+
-+
-+$as_echo "#define _MINIX 1" >>confdefs.h
-+
-+  fi
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
-+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-+if ${ac_cv_safe_to_define___extensions__+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-+#         define __EXTENSIONS__ 1
-+          $ac_includes_default
- int
- main ()
- {
-@@ -5192,170 +4611,26 @@ main ()
-   return 0;
- }
- _ACEOF
--  # Make sure it works both with $CC and with simple cc.
--  # Following AC_PROG_CC_C_O, we do the test twice because some
--  # compilers refuse to overwrite an existing .o file with -o,
--  # though they will create one.
--  am_cv_prog_cc_c_o=yes
--  for am_i in 1 2; do
--    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
--   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
--   ac_status=$?
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); } \
--         && test -f conftest2.$ac_objext; then
--      : OK
--    else
--      am_cv_prog_cc_c_o=no
--      break
--    fi
--  done
--  rm -f core conftest*
--  unset am_i
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_safe_to_define___extensions__=yes
-+else
-+  ac_cv_safe_to_define___extensions__=no
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
--$as_echo "$am_cv_prog_cc_c_o" >&6; }
--if test "$am_cv_prog_cc_c_o" != yes; then
--   # Losing compiler, so override with the script.
--   # FIXME: It is wrong to rewrite CC.
--   # But if we don't then we get into trouble of one sort or another.
--   # A longer-term fix would be to have automake use am__CC in this case,
--   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
--   CC="$am_aux_dir/compile $CC"
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--
--depcc="$CC"   am_compiler_list=
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
--$as_echo_n "checking dependency style of $depcc... " >&6; }
--if ${am_cv_CC_dependencies_compiler_type+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
--  # We make a subdir and do the tests there.  Otherwise we can end up
--  # making bogus files that we don't know about and never remove.  For
--  # instance it was reported that on HP-UX the gcc test will end up
--  # making a dummy file named 'D' -- because '-MD' means "put the output
--  # in D".
--  rm -rf conftest.dir
--  mkdir conftest.dir
--  # Copy depcomp to subdir because otherwise we won't find it if we're
--  # using a relative directory.
--  cp "$am_depcomp" conftest.dir
--  cd conftest.dir
--  # We will build objects and dependencies in a subdirectory because
--  # it helps to detect inapplicable dependency modes.  For instance
--  # both Tru64's cc and ICC support -MD to output dependencies as a
--  # side effect of compilation, but ICC will put the dependencies in
--  # the current directory while Tru64 will put them in the object
--  # directory.
--  mkdir sub
--
--  am_cv_CC_dependencies_compiler_type=none
--  if test "$am_compiler_list" = ""; then
--     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
--  fi
--  am__universal=false
--  case " $depcc " in #(
--     *\ -arch\ *\ -arch\ *) am__universal=true ;;
--     esac
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
-+  test $ac_cv_safe_to_define___extensions__ = yes &&
-+    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
- 
--  for depmode in $am_compiler_list; do
--    # Setup a source with many dependencies, because some compilers
--    # like to wrap large dependency lists on column 80 (with \), and
--    # we should not choose a depcomp mode which is confused by this.
--    #
--    # We need to recreate these files for each test, as the compiler may
--    # overwrite some of them when testing with obscure command lines.
--    # This happens at least with the AIX C compiler.
--    : > sub/conftest.c
--    for i in 1 2 3 4 5 6; do
--      echo '#include "conftst'$i'.h"' >> sub/conftest.c
--      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
--      # Solaris 10 /bin/sh.
--      echo '/* dummy */' > sub/conftst$i.h
--    done
--    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
- 
--    # We check with '-c' and '-o' for the sake of the "dashmstdout"
--    # mode.  It turns out that the SunPro C++ compiler does not properly
--    # handle '-M -o', and we need to detect this.  Also, some Intel
--    # versions had trouble with output in subdirs.
--    am__obj=sub/conftest.${OBJEXT-o}
--    am__minus_obj="-o $am__obj"
--    case $depmode in
--    gcc)
--      # This depmode causes a compiler race in universal mode.
--      test "$am__universal" = false || continue
--      ;;
--    nosideeffect)
--      # After this tag, mechanisms are not by side-effect, so they'll
--      # only be used when explicitly requested.
--      if test "x$enable_dependency_tracking" = xyes; then
--	continue
--      else
--	break
--      fi
--      ;;
--    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
--      # This compiler won't grok '-c -o', but also, the minuso test has
--      # not run yet.  These depmodes are late enough in the game, and
--      # so weak that their functioning should not be impacted.
--      am__obj=conftest.${OBJEXT-o}
--      am__minus_obj=
--      ;;
--    none) break ;;
--    esac
--    if depmode=$depmode \
--       source=sub/conftest.c object=$am__obj \
--       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
--       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
--         >/dev/null 2>conftest.err &&
--       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
--       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
--       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
--       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
--      # icc doesn't choke on unknown options, it will just issue warnings
--      # or remarks (even with -Werror).  So we grep stderr for any message
--      # that says an option was ignored or not supported.
--      # When given -MP, icc 7.0 and 7.1 complain thusly:
--      #   icc: Command line warning: ignoring option '-M'; no argument required
--      # The diagnosis changed in icc 8.0:
--      #   icc: Command line remark: option '-MP' not supported
--      if (grep 'ignoring option' conftest.err ||
--          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
--        am_cv_CC_dependencies_compiler_type=$depmode
--        break
--      fi
--    fi
--  done
-+  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
- 
--  cd ..
--  rm -rf conftest.dir
--else
--  am_cv_CC_dependencies_compiler_type=none
--fi
-+  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
- 
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
--$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
--CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-+  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
- 
-- if
--  test "x$enable_dependency_tracking" != xno \
--  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
--  am__fastdepCC_TRUE=
--  am__fastdepCC_FALSE='#'
--else
--  am__fastdepCC_TRUE='#'
--  am__fastdepCC_FALSE=
--fi
- 
- 
- 
-@@ -15200,6 +14475,7 @@ DEFS=-DHAVE_CONFIG_H
- 
- ac_libobjs=
- ac_ltlibobjs=
-+U=
- for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-   # 1. Remove the extension, and $U if already installed.
-   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-@@ -15230,10 +14506,6 @@ else
-   am__EXEEXT_FALSE=
- fi
- 
--if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
--  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
--Usually this means the macro was only invoked conditionally." "$LINENO" 5
--fi
- if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-   as_fn_error $? "conditional \"AMDEP\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
-@@ -15242,8 +14514,8 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
--if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
--  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-+  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- 
-diff --git a/configure.ac b/configure.ac
-index e3c27eb..923035f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -21,14 +21,15 @@ AC_PREREQ([2.60])
- AC_INIT([xarchiver], [xarchiver_version], [https://github.com/ib/xarchiver/issues])
- : ${CFLAGS="-O2"}
- AC_CONFIG_SRCDIR([src/main.c])
--AC_CONFIG_MACRO_DIRS([m4])
-+AC_CONFIG_HEADER([config.h])
-+AC_CONFIG_MACRO_DIR([m4])
- AC_CANONICAL_HOST
- 
- dnl ***************************
- dnl *** Initialize automake ***
- dnl ***************************
- AM_INIT_AUTOMAKE([1.11 dist-xz])
--AM_CONFIG_HEADER([config.h])
-+AM_PROG_CC_C_O
- AM_SILENT_RULES([yes])
- AM_MAINTAINER_MODE
- 
-@@ -40,7 +41,6 @@ AC_USE_SYSTEM_EXTENSIONS([_GNU_SOURCE])
- dnl ********************************
- dnl *** Check for basic programs ***
- dnl ********************************
--AC_PROG_CC
- AC_PROG_INSTALL
- 
- dnl **************************
-diff --git a/doc/Makefile.in b/doc/Makefile.in
-index 867074e..d3efefc 100644
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -90,10 +90,10 @@ build_triplet = @build@
- host_triplet = @host@
- subdir = doc
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(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)/configure.ac
-+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
-+	$(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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-diff --git a/icons/16x16/Makefile.in b/icons/16x16/Makefile.in
-index e164e5a..5ef5f64 100644
---- a/icons/16x16/Makefile.in
-+++ b/icons/16x16/Makefile.in
-@@ -90,10 +90,10 @@ build_triplet = @build@
- host_triplet = @host@
- subdir = icons/16x16
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(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)/configure.ac
-+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
-+	$(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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-diff --git a/icons/24x24/Makefile.in b/icons/24x24/Makefile.in
-index 26453fd..3b673f0 100644
---- a/icons/24x24/Makefile.in
-+++ b/icons/24x24/Makefile.in
-@@ -90,10 +90,10 @@ build_triplet = @build@
- host_triplet = @host@
- subdir = icons/24x24
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(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)/configure.ac
-+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
-+	$(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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-diff --git a/icons/48x48/Makefile.in b/icons/48x48/Makefile.in
-index 807a2c3..d1e4bee 100644
---- a/icons/48x48/Makefile.in
-+++ b/icons/48x48/Makefile.in
-@@ -90,10 +90,10 @@ build_triplet = @build@
- host_triplet = @host@
- subdir = icons/48x48
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(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)/configure.ac
-+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
-+	$(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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-diff --git a/icons/Makefile.in b/icons/Makefile.in
-index edb683e..e5aa91c 100644
---- a/icons/Makefile.in
-+++ b/icons/Makefile.in
-@@ -89,10 +89,10 @@ build_triplet = @build@
- host_triplet = @host@
- subdir = icons
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(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)/configure.ac
-+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
-+	$(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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-diff --git a/icons/scalable/Makefile.in b/icons/scalable/Makefile.in
-index aac8c0f..45014d7 100644
---- a/icons/scalable/Makefile.in
-+++ b/icons/scalable/Makefile.in
-@@ -90,10 +90,10 @@ build_triplet = @build@
- host_triplet = @host@
- subdir = icons/scalable
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(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)/configure.ac
-+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
-+	$(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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-diff --git a/pixmaps/Makefile.in b/pixmaps/Makefile.in
-index f8a6141..6bf9531 100644
---- a/pixmaps/Makefile.in
-+++ b/pixmaps/Makefile.in
-@@ -90,10 +90,10 @@ build_triplet = @build@
- host_triplet = @host@
- subdir = pixmaps
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(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)/configure.ac
-+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
-+	$(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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-diff --git a/src/Makefile.in b/src/Makefile.in
-index fd0e7a6..d323d1e 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -93,10 +93,10 @@ bin_PROGRAMS = xarchiver$(EXEEXT)
- @GTK_V3_0_TRUE@am__append_2 = -Wno-deprecated-declarations
- subdir = src
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(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)/configure.ac
-+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
-+	$(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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-diff --git a/src/xdgmime/Makefile.in b/src/xdgmime/Makefile.in
-index d69f22d..c651162 100644
---- a/src/xdgmime/Makefile.in
-+++ b/src/xdgmime/Makefile.in
-@@ -90,10 +90,10 @@ build_triplet = @build@
- host_triplet = @host@
- subdir = src/xdgmime
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(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)/configure.ac
-+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
-+	$(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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
--- 
-2.21.0
-
diff --git a/sources b/sources
index d30246a6..3a344c6a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (0.5.4.14.tar.gz) = b38881e6cdfb402499efbd18ab25cac3869cd48ef96941a4bb3cb8b6b130a2317abe3b1d11bfc3d60e81eef7cafa34515fefc11e469443d96d139c2f09cf4498
+SHA512 (xarchiver-0.5.4.27.tar.gz) = 9c6fd0f6cfa67a9d319eb6d877438b6a96e26d8fa1987c004cbe7d9c3012c066ade3b4f0c3ef06fcf4a60b7100c3e41349f676ff3f9672f4e5c5768342f125a9
diff --git a/xarchiver.spec b/xarchiver.spec
index 50b0f8ba..74fff06a 100644
--- a/xarchiver.spec
+++ b/xarchiver.spec
@@ -1,21 +1,20 @@
 Name:           xarchiver
-Version:        0.5.4.14
-Release:        3%{?dist}
+Version:        0.5.4.27
+Release:        2%{?dist}
 Summary:        Archive manager for Xfce
 
-License:        GPLv2+
+License:        GPL-2.0-or-later AND BSD-4-Clause-UC AND (LGPL-2.1-or-later OR AFL-2.0)
 URL:            https://github.com/ib/xarchiver
-Source0:        https://github.com/ib/xarchiver/archive/%{version}.tar.gz
-#               master branch patch to enable building on RHEL7
-#               https://github.com/ib/xarchiver/commit/cd3f297e7f6a760b9c81cff0c3eb9b6fdee05526
-Patch1:         0001-Update-GNU-Build-System.patch
+Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 
-BuildRequires:  gtk2-devel, libxml2-devel, gettext, desktop-file-utils
-BuildRequires:  xfce4-dev-tools >= 4.3.90.2
-BuildRequires:  autoconf >= 2.69
-BuildRequires:  libtool
-BuildRequires:  automake
+BuildRequires:  make
+BuildRequires:  gcc
+BuildRequires:  gtk3-devel
+BuildRequires:  libxml2-devel
+BuildRequires:  gettext
 BuildRequires:  intltool
+BuildRequires:  gtk-doc
+BuildRequires:  desktop-file-utils
 
 # Using Debian's list of recommendations vs suggestions:
 # https://salsa.debian.org/debian/xarchiver/blob/master/debian/control
@@ -27,7 +26,7 @@ Suggests:       arj, binutils, cpio, lz4, lzop, ncompress, unar, zstd, zip
 %endif
 
 %description
-Xarchiver is a lightweight GTK2 only frontend for manipulating 7z, arj, bzip2,
+Xarchiver is a lightweight GTK frontend for manipulating 7z, arj, bzip2,
 gzip, iso, rar, lha, tar, zip, RPM and deb files. It allows you to create
 archives and add, extract, and delete files from them. Password protected
 archives in the arj, 7z, rar, and zip formats are supported.
@@ -37,40 +36,23 @@ archives in the arj, 7z, rar, and zip formats are supported.
 %autosetup -p1
 
 %build
-./autogen.sh
 %configure
 %make_build
 
 %install
-make install DESTDIR=%{buildroot} INSTALL="install -p"
-
-%if 0%{?rhel} && 0%{?rhel} < 7
-# On Fedora < 19 we need to install file-roller.tap as gnome-file-roller.tap,
-# because the name # has to match the basename of the desktop-file in
-# %%{_datadir}/applications.
-rm %{buildroot}%{_libexecdir}/thunar-archive-plugin/xarchiver.tap
-install -p -m 755 xarchiver.tap \
-   %{buildroot}%{_libexecdir}/thunar-archive-plugin/fedora-xarchiver.tap
-%endif
+%make_install
 
 %find_lang %{name}
-%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7)
-desktop-file-install --delete-original \
-    --dir %{buildroot}%{_datadir}/applications \
-    --vendor fedora \
-    %{buildroot}%{_datadir}/applications/%{name}.desktop
-%else
 desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
-%endif
 
-# remove duplicate docs
-rm %{buildroot}%{_docdir}/%{name}/{COPYING,ChangeLog,README}
+# remove useless docs
+rm %{buildroot}%{_docdir}/%{name}/ChangeLog
 
 %files -f %{name}.lang
-%doc COPYING ChangeLog README
+%license COPYING
 %doc %{_docdir}/%{name}/
 %{_bindir}/%{name}
-%{_datadir}/applications/*%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/pixmaps/%{name}/
 %{_libexecdir}/thunar-archive-plugin/
@@ -78,6 +60,71 @@ rm %{buildroot}%{_docdir}/%{name}/{COPYING,ChangeLog,README}
 
 
 %changelog
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4.27-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Wed Jul 01 2026 Dan Horák  <dan[at]danny.cz> - 0.5.4.27-1
+- Update to 0.5.4.27 (rhzb#2494744)
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4.26-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Mon Sep 08 2025 Dan Horák  <dan[at]danny.cz> - 0.5.4.26-1
+- Update to 0.5.4.26 (rhzb#2392621)
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4.25-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Thu Mar 27 2025 Dan Čermák  <dan.cermak@cgc-instruments.com> - 0.5.4.25-1
+- Update to 0.5.4.25 (rhzb#2354300)
+
+* Mon Mar 17 2025 Dan Čermák <dan.cermak@cgc-instruments.com> - 0.5.4.24-1
+- Update to 0.5.4.24 (rhbz#2352812)
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4.23-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4.23-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Fri Mar 01 2024 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 0.5.4.23-1
+- Update to 0.5.4.23 (rhbz#2267148)
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4.22-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Dec 30 2023 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 0.5.4.22-1
+- Update to 0.5.4.22 (rhbz#2256261)
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4.21-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jul 18 2023 Dan Horák <dan[at]danny.cz> - 0.5.4.21-1
+- Update to 0.5.4.21 (rhbz#2085266, rhbz#2163672)
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4.17-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4.17-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4.17-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Jul 12 2021 Dan Horák <dan[at]danny.cz> - 0.5.4.17-1
+- Update to 0.5.4.17 (#1963756, #1943121, #1943121)
+- Switch to gtk3 (#1790918)
+- Drop obsolete distro support
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4.14-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4.14-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4.14-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild