Update upstream source from tag 'upstream/11.4'

Update to upstream version '11.4'
with Debian dir 1bb9aa77a41da6bc4abb4f483b3972aa8708c21f

21 files changed, 428 insertions, 2895 deletions

diff --git a/configure b/configure
index 5b06e74..0603fca 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for daisy-player 11.3.2.
+# Generated by GNU Autoconf 2.69 for daisy-player 11.4.
 #
 # Report bugs to <jos@jlemmens.nl>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='daisy-player'
 PACKAGE_TARNAME='daisy-player'
-PACKAGE_VERSION='11.3.2'
-PACKAGE_STRING='daisy-player 11.3.2'
+PACKAGE_VERSION='11.4'
+PACKAGE_STRING='daisy-player 11.4'
 PACKAGE_BUGREPORT='jos@jlemmens.nl'
 PACKAGE_URL='www.jlemmens.nl'
 
@@ -1361,7 +1361,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures daisy-player 11.3.2 to adapt to many kinds of systems.
+\`configure' configures daisy-player 11.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1432,7 +1432,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of daisy-player 11.3.2:";;
+     short | recursive ) echo "Configuration of daisy-player 11.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1553,7 +1553,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-daisy-player configure 11.3.2
+daisy-player configure 11.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2166,7 +2166,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by daisy-player $as_me 11.3.2, which was
+It was created by daisy-player $as_me 11.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2450,7 +2450,6 @@ gt_needs="$gt_needs "
 gl_header_list="$gl_header_list stdlib.h"
 gl_header_list="$gl_header_list unistd.h"
 gl_header_list="$gl_header_list sys/param.h"
-gt_needs="$gt_needs "
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -3034,7 +3033,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='daisy-player'
- VERSION='11.3.2'
+ VERSION='11.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -9877,1098 +9876,8 @@ _ACEOF
 fi
 
 
-ac_config_files="$ac_config_files Makefile doc/Makefile m4/Makefile man/Makefile po/Makefile.in src/madplay/Makefile src/Makefile"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
-$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
-if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <CoreFoundation/CFPreferences.h>
-int
-main ()
-{
-CFPreferencesCopyAppValue(NULL, NULL)
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gt_cv_func_CFPreferencesCopyAppValue=yes
-else
-  gt_cv_func_CFPreferencesCopyAppValue=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-     LIBS="$gt_save_LIBS"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
-$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
-
-$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
-
-  fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
-$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
-if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <CoreFoundation/CFLocale.h>
-int
-main ()
-{
-CFLocaleCopyCurrent();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gt_cv_func_CFLocaleCopyCurrent=yes
-else
-  gt_cv_func_CFLocaleCopyCurrent=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-     LIBS="$gt_save_LIBS"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
-$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
-  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-
-$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
-
-  fi
-  INTL_MACOSX_LIBS=
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
-  fi
-
-
-
-
-
-
-  LIBINTL=
-  LTLIBINTL=
-  POSUB=
-
-    case " $gt_needs " in
-    *" need-formatstring-macros "*) gt_api_version=3 ;;
-    *" need-ngettext "*) gt_api_version=2 ;;
-    *) gt_api_version=1 ;;
-  esac
-  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
-  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
-
-    if test "$USE_NLS" = "yes"; then
-    gt_use_preinstalled_gnugettext=no
-
-
-        if test $gt_api_version -ge 3; then
-          gt_revision_test_code='
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-'
-        else
-          gt_revision_test_code=
-        fi
-        if test $gt_api_version -ge 2; then
-          gt_expression_test_code=' + * ngettext ("", "", 0)'
-        else
-          gt_expression_test_code=
-        fi
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
-$as_echo_n "checking for GNU gettext in libc... " >&6; }
-if eval \${$gt_func_gnugettext_libc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
-
-int
-main ()
-{
-
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$gt_func_gnugettext_libc=yes"
-else
-  eval "$gt_func_gnugettext_libc=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$gt_func_gnugettext_libc
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
-
-
-
-
-
-          am_save_CPPFLAGS="$CPPFLAGS"
-
-  for element in $INCICONV; do
-    haveit=
-    for x in $CPPFLAGS; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
-    fi
-  done
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
-$as_echo_n "checking for iconv... " >&6; }
-if ${am_cv_func_iconv+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    am_cv_func_iconv="no, consider installing GNU libiconv"
-    am_cv_lib_iconv=no
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <stdlib.h>
-#include <iconv.h>
-
-int
-main ()
-{
-iconv_t cd = iconv_open("","");
-           iconv(cd,NULL,NULL,NULL,NULL);
-           iconv_close(cd);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  am_cv_func_iconv=yes
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
-      LIBS="$LIBS $LIBICONV"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <stdlib.h>
-#include <iconv.h>
-
-int
-main ()
-{
-iconv_t cd = iconv_open("","");
-             iconv(cd,NULL,NULL,NULL,NULL);
-             iconv_close(cd);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  am_cv_lib_iconv=yes
-        am_cv_func_iconv=yes
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-      LIBS="$am_save_LIBS"
-    fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
-$as_echo "$am_cv_func_iconv" >&6; }
-  if test "$am_cv_func_iconv" = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
-$as_echo_n "checking for working iconv... " >&6; }
-if ${am_cv_func_iconv_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-                  am_save_LIBS="$LIBS"
-      if test $am_cv_lib_iconv = yes; then
-        LIBS="$LIBS $LIBICONV"
-      fi
-      am_cv_func_iconv_works=no
-      for ac_iconv_const in '' 'const'; do
-        if test "$cross_compiling" = yes; then :
-  case "$host_os" in
-             aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
-             *)            am_cv_func_iconv_works="guessing yes" ;;
-           esac
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <iconv.h>
-#include <string.h>
-
-#ifndef ICONV_CONST
-# define ICONV_CONST $ac_iconv_const
-#endif
-
-int
-main ()
-{
-int result = 0;
-  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
-     returns.  */
-  {
-    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
-    if (cd_utf8_to_88591 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
-        char buf[10];
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_utf8_to_88591,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res == 0)
-          result |= 1;
-        iconv_close (cd_utf8_to_88591);
-      }
-  }
-  /* Test against Solaris 10 bug: Failures are not distinguishable from
-     successful returns.  */
-  {
-    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
-    if (cd_ascii_to_88591 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\263";
-        char buf[10];
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_ascii_to_88591,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res == 0)
-          result |= 2;
-        iconv_close (cd_ascii_to_88591);
-      }
-  }
-  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
-  {
-    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
-    if (cd_88591_to_utf8 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\304";
-        static char buf[2] = { (char)0xDE, (char)0xAD };
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = 1;
-        char *outptr = buf;
-        size_t outbytesleft = 1;
-        size_t res = iconv (cd_88591_to_utf8,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
-          result |= 4;
-        iconv_close (cd_88591_to_utf8);
-      }
-  }
-#if 0 /* This bug could be worked around by the caller.  */
-  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
-  {
-    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
-    if (cd_88591_to_utf8 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
-        char buf[50];
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_88591_to_utf8,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if ((int)res > 0)
-          result |= 8;
-        iconv_close (cd_88591_to_utf8);
-      }
-  }
-#endif
-  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
-     provided.  */
-  if (/* Try standardized names.  */
-      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
-      /* Try IRIX, OSF/1 names.  */
-      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
-      /* Try AIX names.  */
-      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
-      /* Try HP-UX names.  */
-      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-    result |= 16;
-  return result;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  am_cv_func_iconv_works=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-        test "$am_cv_func_iconv_works" = no || break
-      done
-      LIBS="$am_save_LIBS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
-$as_echo "$am_cv_func_iconv_works" >&6; }
-    case "$am_cv_func_iconv_works" in
-      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
-      *)   am_func_iconv=yes ;;
-    esac
-  else
-    am_func_iconv=no am_cv_lib_iconv=no
-  fi
-  if test "$am_func_iconv" = yes; then
-
-$as_echo "#define HAVE_ICONV 1" >>confdefs.h
-
-  fi
-  if test "$am_cv_lib_iconv" = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
-$as_echo_n "checking how to link with libiconv... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
-$as_echo "$LIBICONV" >&6; }
-  else
-            CPPFLAGS="$am_save_CPPFLAGS"
-    LIBICONV=
-    LTLIBICONV=
-  fi
-
-
-
-
-
-
-
-
-
-
-
-    use_additional=yes
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-
-# Check whether --with-libintl-prefix was given.
-if test "${with_libintl_prefix+set}" = set; then :
-  withval=$with_libintl_prefix;
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/$acl_libdirstem"
-        if test "$acl_libdirstem2" != "$acl_libdirstem" \
-           && ! test -d "$withval/$acl_libdirstem"; then
-          additional_libdir="$withval/$acl_libdirstem2"
-        fi
-      fi
-    fi
-
-fi
-
-      LIBINTL=
-  LTLIBINTL=
-  INCINTL=
-  LIBINTL_PREFIX=
-      HAVE_LIBINTL=
-  rpathdirs=
-  ltrpathdirs=
-  names_already_handled=
-  names_next_round='intl '
-  while test -n "$names_next_round"; do
-    names_this_round="$names_next_round"
-    names_next_round=
-    for name in $names_this_round; do
-      already_handled=
-      for n in $names_already_handled; do
-        if test "$n" = "$name"; then
-          already_handled=yes
-          break
-        fi
-      done
-      if test -z "$already_handled"; then
-        names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
-        eval value=\"\$HAVE_LIB$uppername\"
-        if test -n "$value"; then
-          if test "$value" = yes; then
-            eval value=\"\$LIB$uppername\"
-            test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value"
-            eval value=\"\$LTLIB$uppername\"
-            test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value"
-          else
-                                    :
-          fi
-        else
-                              found_dir=
-          found_la=
-          found_so=
-          found_a=
-          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
-          if test -n "$acl_shlibext"; then
-            shrext=".$acl_shlibext"             # typically: shrext=.so
-          else
-            shrext=
-          fi
-          if test $use_additional = yes; then
-            dir="$additional_libdir"
-                                    if test -n "$acl_shlibext"; then
-              if test -f "$dir/$libname$shrext"; then
-                found_dir="$dir"
-                found_so="$dir/$libname$shrext"
-              else
-                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                  ver=`(cd "$dir" && \
-                        for f in "$libname$shrext".*; do echo "$f"; done \
-                        | sed -e "s,^$libname$shrext\\\\.,," \
-                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                        | sed 1q ) 2>/dev/null`
-                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                    found_dir="$dir"
-                    found_so="$dir/$libname$shrext.$ver"
-                  fi
-                else
-                  eval library_names=\"$acl_library_names_spec\"
-                  for f in $library_names; do
-                    if test -f "$dir/$f"; then
-                      found_dir="$dir"
-                      found_so="$dir/$f"
-                      break
-                    fi
-                  done
-                fi
-              fi
-            fi
-                        if test "X$found_dir" = "X"; then
-              if test -f "$dir/$libname.$acl_libext"; then
-                found_dir="$dir"
-                found_a="$dir/$libname.$acl_libext"
-              fi
-            fi
-            if test "X$found_dir" != "X"; then
-              if test -f "$dir/$libname.la"; then
-                found_la="$dir/$libname.la"
-              fi
-            fi
-          fi
-          if test "X$found_dir" = "X"; then
-            for x in $LDFLAGS $LTLIBINTL; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-              case "$x" in
-                -L*)
-                  dir=`echo "X$x" | sed -e 's/^X-L//'`
-                                    if test -n "$acl_shlibext"; then
-                    if test -f "$dir/$libname$shrext"; then
-                      found_dir="$dir"
-                      found_so="$dir/$libname$shrext"
-                    else
-                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                        ver=`(cd "$dir" && \
-                              for f in "$libname$shrext".*; do echo "$f"; done \
-                              | sed -e "s,^$libname$shrext\\\\.,," \
-                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                              | sed 1q ) 2>/dev/null`
-                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                          found_dir="$dir"
-                          found_so="$dir/$libname$shrext.$ver"
-                        fi
-                      else
-                        eval library_names=\"$acl_library_names_spec\"
-                        for f in $library_names; do
-                          if test -f "$dir/$f"; then
-                            found_dir="$dir"
-                            found_so="$dir/$f"
-                            break
-                          fi
-                        done
-                      fi
-                    fi
-                  fi
-                                    if test "X$found_dir" = "X"; then
-                    if test -f "$dir/$libname.$acl_libext"; then
-                      found_dir="$dir"
-                      found_a="$dir/$libname.$acl_libext"
-                    fi
-                  fi
-                  if test "X$found_dir" != "X"; then
-                    if test -f "$dir/$libname.la"; then
-                      found_la="$dir/$libname.la"
-                    fi
-                  fi
-                  ;;
-              esac
-              if test "X$found_dir" != "X"; then
-                break
-              fi
-            done
-          fi
-          if test "X$found_dir" != "X"; then
-                        LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
-            if test "X$found_so" != "X"; then
-                                                        if test "$enable_rpath" = no \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
-                                LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-              else
-                                                                                haveit=
-                for x in $ltrpathdirs; do
-                  if test "X$x" = "X$found_dir"; then
-                    haveit=yes
-                    break
-                  fi
-                done
-                if test -z "$haveit"; then
-                  ltrpathdirs="$ltrpathdirs $found_dir"
-                fi
-                                if test "$acl_hardcode_direct" = yes; then
-                                                      LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-                else
-                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
-                                                            LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-                                                            haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $found_dir"
-                    fi
-                  else
-                                                                                haveit=
-                    for x in $LDFLAGS $LIBINTL; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                      if test "X$x" = "X-L$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
-                    fi
-                    if test "$acl_hardcode_minus_L" != no; then
-                                                                                        LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-                    else
-                                                                                                                                                                                LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
-                    fi
-                  fi
-                fi
-              fi
-            else
-              if test "X$found_a" != "X"; then
-                                LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a"
-              else
-                                                LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name"
-              fi
-            fi
-                        additional_includedir=
-            case "$found_dir" in
-              */$acl_libdirstem | */$acl_libdirstem/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
-                if test "$name" = 'intl'; then
-                  LIBINTL_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-              */$acl_libdirstem2 | */$acl_libdirstem2/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
-                if test "$name" = 'intl'; then
-                  LIBINTL_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-            esac
-            if test "X$additional_includedir" != "X"; then
-                                                                                                                if test "X$additional_includedir" != "X/usr/include"; then
-                haveit=
-                if test "X$additional_includedir" = "X/usr/local/include"; then
-                  if test -n "$GCC"; then
-                    case $host_os in
-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                    esac
-                  fi
-                fi
-                if test -z "$haveit"; then
-                  for x in $CPPFLAGS $INCINTL; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                    if test "X$x" = "X-I$additional_includedir"; then
-                      haveit=yes
-                      break
-                    fi
-                  done
-                  if test -z "$haveit"; then
-                    if test -d "$additional_includedir"; then
-                                            INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir"
-                    fi
-                  fi
-                fi
-              fi
-            fi
-                        if test -n "$found_la"; then
-                                                        save_libdir="$libdir"
-              case "$found_la" in
-                */* | *\\*) . "$found_la" ;;
-                *) . "./$found_la" ;;
-              esac
-              libdir="$save_libdir"
-                            for dep in $dependency_libs; do
-                case "$dep" in
-                  -L*)
-                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
-                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
-                      haveit=
-                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
-                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
-                        if test -n "$GCC"; then
-                          case $host_os in
-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                          esac
-                        fi
-                      fi
-                      if test -z "$haveit"; then
-                        haveit=
-                        for x in $LDFLAGS $LIBINTL; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                                                        LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir"
-                          fi
-                        fi
-                        haveit=
-                        for x in $LDFLAGS $LTLIBINTL; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                                                        LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir"
-                          fi
-                        fi
-                      fi
-                    fi
-                    ;;
-                  -R*)
-                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    if test "$enable_rpath" != no; then
-                                                                  haveit=
-                      for x in $rpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        rpathdirs="$rpathdirs $dir"
-                      fi
-                                                                  haveit=
-                      for x in $ltrpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        ltrpathdirs="$ltrpathdirs $dir"
-                      fi
-                    fi
-                    ;;
-                  -l*)
-                                        names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-                    ;;
-                  *.la)
-                                                                                names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-                    ;;
-                  *)
-                                        LIBINTL="${LIBINTL}${LIBINTL:+ }$dep"
-                    LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep"
-                    ;;
-                esac
-              done
-            fi
-          else
-                                                            LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
-            LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name"
-          fi
-        fi
-      fi
-    done
-  done
-  if test "X$rpathdirs" != "X"; then
-    if test -n "$acl_hardcode_libdir_separator"; then
-                        alldirs=
-      for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
-      done
-            acl_save_libdir="$libdir"
-      libdir="$alldirs"
-      eval flag=\"$acl_hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
-      LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
-    else
-            for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
-        libdir="$found_dir"
-        eval flag=\"$acl_hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
-        LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
-      done
-    fi
-  fi
-  if test "X$ltrpathdirs" != "X"; then
-            for found_dir in $ltrpathdirs; do
-      LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
-    done
-  fi
-
-
-
-
-
-
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
-$as_echo_n "checking for GNU gettext in libintl... " >&6; }
-if eval \${$gt_func_gnugettext_libintl+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  gt_save_CPPFLAGS="$CPPFLAGS"
-            CPPFLAGS="$CPPFLAGS $INCINTL"
-            gt_save_LIBS="$LIBS"
-            LIBS="$LIBS $LIBINTL"
-                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);
-
-int
-main ()
-{
-
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$gt_func_gnugettext_libintl=yes"
-else
-  eval "$gt_func_gnugettext_libintl=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-                        if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
-              LIBS="$LIBS $LIBICONV"
-              cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);
-
-int
-main ()
-{
-
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  LIBINTL="$LIBINTL $LIBICONV"
-                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                 eval "$gt_func_gnugettext_libintl=yes"
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-            fi
-            CPPFLAGS="$gt_save_CPPFLAGS"
-            LIBS="$gt_save_LIBS"
-fi
-eval ac_res=\$$gt_func_gnugettext_libintl
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-        fi
-
-                                        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
-           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
-                && test "$PACKAGE" != gettext-runtime \
-                && test "$PACKAGE" != gettext-tools; }; then
-          gt_use_preinstalled_gnugettext=yes
-        else
-                    LIBINTL=
-          LTLIBINTL=
-          INCINTL=
-        fi
-
-
-
-    if test -n "$INTL_MACOSX_LIBS"; then
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-                LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
-        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
-      fi
-    fi
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes" \
-       || test "$nls_cv_use_gnu_gettext" = "yes"; then
-
-$as_echo "#define ENABLE_NLS 1" >>confdefs.h
-
-    else
-      USE_NLS=no
-    fi
-  fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
-$as_echo_n "checking whether to use NLS... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-$as_echo "$USE_NLS" >&6; }
-  if test "$USE_NLS" = "yes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
-$as_echo_n "checking where the gettext function comes from... " >&6; }
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        gt_source="external libintl"
-      else
-        gt_source="libc"
-      fi
-    else
-      gt_source="included intl directory"
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
-$as_echo "$gt_source" >&6; }
-  fi
-
-  if test "$USE_NLS" = "yes"; then
+ac_config_files="$ac_config_files Makefile doc/Makefile m4/Makefile man/Makefile po/Makefile.in src/Makefile"
 
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
-$as_echo_n "checking how to link with libintl... " >&6; }
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
-$as_echo "$LIBINTL" >&6; }
-
-  for element in $INCINTL; do
-    haveit=
-    for x in $CPPFLAGS; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
-    fi
-  done
-
-      fi
-
-
-$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
-
-
-$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
-
-    fi
-
-        POSUB=po
-  fi
-
-
-
-    INTLLIBS="$LIBINTL"
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
-
-
-
-
-
-# AC_CONFIG_SRCDIR([src/madplay]) # jos
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -10992,7 +9901,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='daisy-player'
- VERSION='11.3.2'
+ VERSION='11.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -11598,734 +10507,6 @@ 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
-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;
-}
-_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 :
-
-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 :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-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
-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"
-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
-
-  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
-
-    # 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
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-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
-
- 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
-
-
-
-
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
@@ -12522,48 +10703,6 @@ $as_echo "#define const /**/" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-$as_echo_n "checking for inline... " >&6; }
-if ${ac_cv_c_inline+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef __cplusplus
-typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
-#endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_inline=$ac_kw
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  test "$ac_cv_c_inline" != no && break
-done
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-$as_echo "$ac_cv_c_inline" >&6; }
-
-case $ac_cv_c_inline in
-  inline | yes) ;;
-  *)
-    case $ac_cv_c_inline in
-      no) ac_val=;;
-      *) ac_val=$ac_cv_c_inline;;
-    esac
-    cat >>confdefs.h <<_ACEOF
-#ifndef __cplusplus
-#define inline $ac_val
-#endif
-_ACEOF
-    ;;
-esac
-
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
 if ${ac_cv_c_bigendian+:} false; then :
@@ -13047,8 +11186,6 @@ $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable profiling" >&5
 $as_echo_n "checking whether to enable profiling... " >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_profiling-no}" >&5
@@ -13060,17 +11197,6 @@ $as_echo_n "checking whether to enable debugging... " >&6; }
 $as_echo "${enable_experimental-no}" >&6; }
 
 
-ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
-if test "x$ac_cv_type_ssize_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define ssize_t int
-_ACEOF
-
-fi
-
 for ac_prog in 'bison -y' byacc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -13114,17 +11240,6 @@ fi
 done
 test -n "$YACC" || YACC="yacc"
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
-
 for ac_func in __argz_count
 do :
   ac_fn_c_check_func "$LINENO" "__argz_count" "ac_cv_func___argz_count"
@@ -13158,28 +11273,6 @@ _ACEOF
 fi
 done
 
-for ac_func in memmove
-do :
-  ac_fn_c_check_func "$LINENO" "memmove" "ac_cv_func_memmove"
-if test "x$ac_cv_func_memmove" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_MEMMOVE 1
-_ACEOF
-
-fi
-done
-
-for ac_func in memset
-do :
-  ac_fn_c_check_func "$LINENO" "memset" "ac_cv_func_memset"
-if test "x$ac_cv_func_memset" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_MEMSET 1
-_ACEOF
-
-fi
-done
-
 for ac_func in nl_langinfo
 do :
   ac_fn_c_check_func "$LINENO" "nl_langinfo" "ac_cv_func_nl_langinfo"
@@ -13191,17 +11284,6 @@ _ACEOF
 fi
 done
 
-for ac_func in pow
-do :
-  ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
-if test "x$ac_cv_func_pow" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_POW 1
-_ACEOF
-
-fi
-done
-
 for ac_func in strchr
 do :
   ac_fn_c_check_func "$LINENO" "strchr" "ac_cv_func_strchr"
@@ -13224,17 +11306,6 @@ _ACEOF
 fi
 done
 
-for ac_func in strncasecmp
-do :
-  ac_fn_c_check_func "$LINENO" "strncasecmp" "ac_cv_func_strncasecmp"
-if test "x$ac_cv_func_strncasecmp" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STRNCASECMP 1
-_ACEOF
-
-fi
-done
-
 for ac_func in strrchr
 do :
   ac_fn_c_check_func "$LINENO" "strrchr" "ac_cv_func_strrchr"
@@ -13257,17 +11328,6 @@ _ACEOF
 fi
 done
 
-for ac_func in strtol
-do :
-  ac_fn_c_check_func "$LINENO" "strtol" "ac_cv_func_strtol"
-if test "x$ac_cv_func_strtol" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STRTOL 1
-_ACEOF
-
-fi
-done
-
 for ac_header in float.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "float.h" "ac_cv_header_float_h" "$ac_includes_default"
@@ -13340,18 +11400,6 @@ fi
 
 done
 
-for ac_header in wchar.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "wchar.h" "ac_cv_header_wchar_h" "$ac_includes_default"
-if test "x$ac_cv_header_wchar_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_WCHAR_H 1
-_ACEOF
-
-fi
-
-done
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
 $as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
 if ${ac_cv_header_stdbool_h+:} false; then :
@@ -13740,638 +11788,6 @@ _ACEOF
 
 fi
 
-for ac_header in stdlib.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdlib_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STDLIB_H 1
-_ACEOF
-
-fi
-
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
-$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
-if ${ac_cv_func_malloc_0_nonnull+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_func_malloc_0_nonnull=no
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined STDC_HEADERS || defined HAVE_STDLIB_H
-# include <stdlib.h>
-#else
-char *malloc ();
-#endif
-
-int
-main ()
-{
-return ! malloc (0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_func_malloc_0_nonnull=yes
-else
-  ac_cv_func_malloc_0_nonnull=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
-$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
-if test $ac_cv_func_malloc_0_nonnull = yes; then :
-
-$as_echo "#define HAVE_MALLOC 1" >>confdefs.h
-
-else
-  $as_echo "#define HAVE_MALLOC 0" >>confdefs.h
-
-   case " $LIBOBJS " in
-  *" malloc.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS malloc.$ac_objext"
- ;;
-esac
-
-
-$as_echo "#define malloc rpl_malloc" >>confdefs.h
-
-fi
-
-
-for ac_header in stdlib.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdlib_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STDLIB_H 1
-_ACEOF
-
-fi
-
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5
-$as_echo_n "checking for GNU libc compatible realloc... " >&6; }
-if ${ac_cv_func_realloc_0_nonnull+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_func_realloc_0_nonnull=no
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined STDC_HEADERS || defined HAVE_STDLIB_H
-# include <stdlib.h>
-#else
-char *realloc ();
-#endif
-
-int
-main ()
-{
-return ! realloc (0, 0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_func_realloc_0_nonnull=yes
-else
-  ac_cv_func_realloc_0_nonnull=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5
-$as_echo "$ac_cv_func_realloc_0_nonnull" >&6; }
-if test $ac_cv_func_realloc_0_nonnull = yes; then :
-
-$as_echo "#define HAVE_REALLOC 1" >>confdefs.h
-
-else
-  $as_echo "#define HAVE_REALLOC 0" >>confdefs.h
-
-   case " $LIBOBJS " in
-  *" realloc.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS realloc.$ac_objext"
- ;;
-esac
-
-
-$as_echo "#define realloc rpl_realloc" >>confdefs.h
-
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5
-$as_echo_n "checking for working strtod... " >&6; }
-if ${ac_cv_func_strtod+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_func_strtod=no
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-$ac_includes_default
-#ifndef strtod
-double strtod ();
-#endif
-int
-main()
-{
-  {
-    /* Some versions of Linux strtod mis-parse strings with leading '+'.  */
-    char *string = " +69";
-    char *term;
-    double value;
-    value = strtod (string, &term);
-    if (value != 69 || term != (string + 4))
-      return 1;
-  }
-
-  {
-    /* Under Solaris 2.4, strtod returns the wrong value for the
-       terminating character under some conditions.  */
-    char *string = "NaN";
-    char *term;
-    strtod (string, &term);
-    if (term != string && *(term - 1) == 0)
-      return 1;
-  }
-  return 0;
-}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_func_strtod=yes
-else
-  ac_cv_func_strtod=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5
-$as_echo "$ac_cv_func_strtod" >&6; }
-if test $ac_cv_func_strtod = no; then
-  case " $LIBOBJS " in
-  *" strtod.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS strtod.$ac_objext"
- ;;
-esac
-
-ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
-if test "x$ac_cv_func_pow" = xyes; then :
-
-fi
-
-if test $ac_cv_func_pow = no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
-$as_echo_n "checking for pow in -lm... " >&6; }
-if ${ac_cv_lib_m_pow+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pow ();
-int
-main ()
-{
-return pow ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_m_pow=yes
-else
-  ac_cv_lib_m_pow=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
-$as_echo "$ac_cv_lib_m_pow" >&6; }
-if test "x$ac_cv_lib_m_pow" = xyes; then :
-  POW_LIB=-lm
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5
-$as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;}
-fi
-
-fi
-
-fi
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
-  if test -n "$CCC"; then
-    CXX=$CCC
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-  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_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # 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_CXX="$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
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-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_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # 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_CXX="$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_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CXX" && break
-done
-
-  if test "x$ac_ct_CXX" = x; then
-    CXX="g++"
-  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
-    CXX=$ac_ct_CXX
-  fi
-fi
-
-  fi
-fi
-# 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_cxx_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_cxx_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_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GXX=yes
-else
-  GXX=
-fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
-else
-  CXXFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-else
-  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-	 CXXFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_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_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-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="$CXX"  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_CXX_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_CXX_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
-
-  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
-
-    # 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_CXX_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CXX_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-  am__fastdepCXX_TRUE=
-  am__fastdepCXX_FALSE='#'
-else
-  am__fastdepCXX_TRUE='#'
-  am__fastdepCXX_FALSE=
-fi
-
-
 
 
 depend_audio=""
@@ -14400,8 +11816,6 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $audio" >&5
 $as_echo "$audio" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable profiling" >&5
-$as_echo_n "checking whether to enable profiling... " >&6; }
 # Check whether --enable-profiling was given.
 if test "${enable_profiling+set}" = set; then :
   enableval=$enable_profiling;
@@ -14411,12 +11825,8 @@ if test "${enable_profiling+set}" = set; then :
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_profiling-no}" >&5
-$as_echo "${enable_profiling-no}" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable debugging" >&5
-$as_echo_n "checking whether to enable debugging... " >&6; }
-# Check whether --enable-debugging was given.
+# Check whether --enable-debugging was given.
 if test "${enable_debugging+set}" = set; then :
   enableval=$enable_debugging;
     case "$enableval" in
@@ -14511,9 +11921,6 @@ $as_echo "#define EXPERIMENTAL 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_experimental-no}" >&5
-$as_echo "${enable_experimental-no}" >&6; }
-
 
 test -n "$arch"     && CFLAGS="$CFLAGS $arch"
 test -n "$debug"    && CFLAGS="$CFLAGS $debug"
@@ -14699,15 +12106,7 @@ else
   am__EXEEXT_FALSE=
 fi
 
-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__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
@@ -15105,7 +12504,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by daisy-player $as_me 11.3.2, which was
+This file was extended by daisy-player $as_me 11.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15172,7 +12571,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-daisy-player config.status 11.3.2
+daisy-player config.status 11.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -15316,7 +12715,6 @@ do
     "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
     "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-    "src/madplay/Makefile") CONFIG_FILES="$CONFIG_FILES src/madplay/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
@@ -16158,3 +13556,10 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
+
+
+echo
+echo "configure madplay..."
+echo
+
+cd src/madplay && ./configure
diff --git a/configure.ac b/configure.ac
index b854ae0..e5c3447 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([daisy-player],[11.3.2],[jos@jlemmens.nl],[],[www.jlemmens.nl])
+AC_INIT([daisy-player],[11.4],[jos@jlemmens.nl],[],[www.jlemmens.nl])
 AM_INIT_AUTOMAKE([subdir-objects])
 AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_HEADERS([config.h])
@@ -90,16 +90,7 @@ AC_CONFIG_FILES([Makefile
                  m4/Makefile
                  man/Makefile
                  po/Makefile.in
-                 src/madplay/Makefile
                  src/Makefile])
-AM_GNU_GETTEXT([external])
-AC_PROG_LN_S
-
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ([2.69])
-
-# AC_CONFIG_SRCDIR([src/madplay]) # jos
 
 AM_INIT_AUTOMAKE
 
@@ -107,10 +98,6 @@ dnl System type.
 
 AC_CANONICAL_HOST
 
-dnl Checks for programs.
-
-AC_PROG_CC
-
 dnl Support for libtool.
 
 dnl Compiler options.
@@ -121,7 +108,6 @@ AC_HEADER_STDC
 dnl Checks for typedefs, structures, and compiler characteristics.
 
 AC_C_CONST
-AC_C_INLINE
 AC_C_BIGENDIAN
 
 dnl Checks for library functions.
@@ -133,9 +119,6 @@ AC_SEARCH_LIBS(pow, m)
 AC_SEARCH_LIBS(log10, m)
 AC_MSG_CHECKING([whether to use mmap])
 AC_CACHE_SAVE
-
-dnl madplay options...
-
 AC_MSG_CHECKING([whether to enable profiling])
 AC_MSG_RESULT(${enable_profiling-no})
 
@@ -144,29 +127,21 @@ AC_MSG_RESULT(${enable_experimental-no})
 
 dnl Create output files.
 
-AC_TYPE_SSIZE_T
 AC_PROG_YACC
-AC_PROG_LN_S
 AC_CHECK_FUNCS([__argz_count])
 AC_CHECK_FUNCS([__argz_next])
 AC_CHECK_FUNCS([__argz_stringify])
-AC_CHECK_FUNCS([memmove])
-AC_CHECK_FUNCS([memset])
 AC_CHECK_FUNCS([nl_langinfo])
-AC_CHECK_FUNCS([pow])
 AC_CHECK_FUNCS([strchr])
 AC_CHECK_FUNCS([strcspn])
-AC_CHECK_FUNCS([strncasecmp])
 AC_CHECK_FUNCS([strrchr])
 AC_CHECK_FUNCS([strstr])
-AC_CHECK_FUNCS([strtol])
 AC_CHECK_HEADERS([float.h])
 AC_CHECK_HEADERS([langinfo.h])
 AC_CHECK_HEADERS([libintl.h])
 AC_CHECK_HEADERS([locale.h])
 AC_CHECK_HEADERS([malloc.h])
 AC_CHECK_HEADERS([stdio_ext.h])
-AC_CHECK_HEADERS([wchar.h])
 AC_CHECK_HEADER_STDBOOL
 AC_CHECK_HEADER(id3tag.h, [], [
         AC_MSG_ERROR([id3tag.h was not found
@@ -184,10 +159,6 @@ AC_CHECK_HEADERS([limits.h])
 AC_CHECK_HEADERS([stddef.h])
 AC_CHECK_HEADERS([sys/param.h])
 AC_FUNC_ALLOCA
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
-AC_FUNC_STRTOD
-AC_PROG_CXX
 
 dnl Select an audio system.
 
@@ -206,17 +177,14 @@ fi
 
 AC_MSG_RESULT($audio)
 
-AC_MSG_CHECKING([whether to enable profiling])
 AC_ARG_ENABLE(profiling, AS_HELP_STRING([--enable-profiling],[generate profiling code]),
 [
     case "$enableval" in
 	yes) profile="-pg" ;;
     esac
 ])
-AC_MSG_RESULT(${enable_profiling-no})
 
-AC_MSG_CHECKING([whether to enable debugging])
-AC_ARG_ENABLE(debugging, AS_HELP_STRING([--enable-debugging],[enable diagnostic debugging support])
+AC_ARG_ENABLE(debugging, AS_HELP_STRING([--enable-debugging],[enable diagnostic debugging support])
 AS_HELP_STRING([--disable-debugging],[do not enable debugging and use more optimization]),
 [
     case "$enableval" in
@@ -256,9 +224,6 @@ AC_ARG_ENABLE(experimental, AS_HELP_STRING([--enable-experimental],[enable exper
 	    ;;
     esac
 ])
-AC_MSG_RESULT(${enable_experimental-no})
-
-dnl Create output files.
 
 test -n "$arch"     && CFLAGS="$CFLAGS $arch"
 test -n "$debug"    && CFLAGS="$CFLAGS $debug"
@@ -266,3 +231,11 @@ test -n "$optimize" && CFLAGS="$CFLAGS $optimize"
 test -n "$profile"  && CFLAGS="$CFLAGS $profile" LDFLAGS="$LDFLAGS $profile"
 AC_DEFINE([AUDIO_DEFAULT], [], [audio_wav])
 AC_OUTPUT
+
+dnl madplay stuff
+
+echo
+echo "configure madplay..."
+echo
+
+cd src/madplay && ./configure
diff --git a/doc/Changelog b/doc/Changelog
index 3643612..486a358 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -279,3 +279,7 @@ Samuel Thibault <sthibault@debian.org>
 	(ISO9660 fs is case-insensitive by default)
 11.3.1	Added a Czech translation
 11.3.2	Convert ALSA devicename into pulseaudio devicename.
+11.3.3	Another polish translation added.
+11.4	Another French translation added.
+	The external command sox is no longer needed.
+	daisy-player now uses the sox library.
diff --git a/doc/Makefile.in b/doc/Makefile.in
index bc9e5bb..9a498fe 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -316,9 +316,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu doc/Makefile
+	  $(AUTOMAKE) --foreign doc/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/doc/TODO b/doc/TODO
index 73243db..64acc53 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,3 +1,2 @@
 - time-viewing starts on 00:00 when next page starts in daisy 3 files.
-- how to play pulseaudio with the C function sox_open_write ().
-- how to run ./src/madplay/configure from ./configure.ac
+- "Store current item to disk". WAV file is not closed correctly.
diff --git a/doc/daisy-player.html b/doc/daisy-player.html
index d52a6f1..8757076 100644
--- a/doc/daisy-player.html
+++ b/doc/daisy-player.html
@@ -2,7 +2,7 @@
 <HTML><HEAD><TITLE>Man page of daisy-player</TITLE>
 </HEAD><BODY>
 <H1>daisy-player</H1>
-Section: Linux Reference Manual (1)<BR>Updated: 16 February 2018<BR><A HREF="#index">Index</A>
+Section: Linux Reference Manual (1)<BR>Updated: 10 March 2018<BR><A HREF="#index">Index</A>
 <A HREF="/cgi-bin/man/man2html">Return to Main Contents</A><HR>
 
 <A NAME="lbAB">&nbsp;</A>
@@ -205,18 +205,14 @@ decrease playback volume
 <A NAME="lbAH">&nbsp;</A>
 <H2>NOTES</H2>
 
-On some soundcards (especially onboard cards) the alsa driver only can play one file at a time. <B>daisy-player</B> crashes sometimes on these cards. From this version on the pulseaudio sound-driver will be used instead. The pulseaudio sound system has no problems with these cards.
 <P>
-
-I don't know how to play with pulseaudio in the C function sox_open_write (). For now, the external command sox will be used instead.
-<P>
-
 When playing an Audio-CD skip-left and skip-right react a little late. The same for commands like 'U', 'D' and HOME.
 <A NAME="lbAI">&nbsp;</A>
 <H2>THANKS TO</H2>
 
+Daniel Veillard &lt;<A HREF="mailto:daniel@veillard.com">daniel@veillard.com</A>&gt;
 <DL COMPACT>
-<DT><B>Daniel Veillard &lt;<A HREF="mailto:daniel@veillard.com">daniel@veillard.com</A>&gt;</B>
+<DT><B>Rob Sykes &lt;<A HREF="mailto:aquegg@yahoo.co.uk">aquegg@yahoo.co.uk</A>&gt;</B>
 
 <DD>
 for the XML2 library.
@@ -248,7 +244,7 @@ This file, in XML-format, contains the name of the desired audio device and the
 <A NAME="lbAK">&nbsp;</A>
 <H2>SEE ALSO</H2>
 
-<B><A HREF="/cgi-bin/man/man2html?1+cddbget">cddbget</A></B>(1), <B><A HREF="/cgi-bin/man/man2html?1+unar">unar</A></B>(1), <B><A HREF="/cgi-bin/man/man2html?1+eject">eject</A></B>(1), <B><A HREF="/cgi-bin/man/man2html?1+udisksctl">udisksctl</A></B>(1), <B><A HREF="/cgi-bin/man/man2html?1+sox">sox</A></B>(1), <B><A HREF="/cgi-bin/man/man2html?1+pulseaudio">pulseaudio</A></B>(1)
+<B><A HREF="/cgi-bin/man/man2html?1+cddbget">cddbget</A></B>(1), <B><A HREF="/cgi-bin/man/man2html?1+unar">unar</A></B>(1), <B><A HREF="/cgi-bin/man/man2html?1+eject">eject</A></B>(1), <B><A HREF="/cgi-bin/man/man2html?1+udisksctl">udisksctl</A></B>(1), <B><A HREF="/cgi-bin/man/man2html?1+pulseaudio">pulseaudio</A></B>(1)
 <A NAME="lbAL">&nbsp;</A>
 <H2>AUTHOR</H2>
 
@@ -282,6 +278,6 @@ This program is free software; you can redistribute it and/or modify it under th
 This document was created by
 <A HREF="/cgi-bin/man/man2html">man2html</A>,
 using the manual pages.<BR>
-Time: 15:07:54 GMT, February 16, 2018
+Time: 19:38:45 GMT, March 10, 2018
 </BODY>
 </HTML>
diff --git a/doc/daisy-player.txt b/doc/daisy-player.txt
index 61dd9e6..57d2bb6 100644
--- a/doc/daisy-player.txt
+++ b/doc/daisy-player.txt
@@ -64,14 +64,12 @@ V,7             increase playback volume (beware of Clipping)
 v,1             decrease playback volume
 
 NOTES
-On some soundcards (especially onboard cards) the alsa driver only can play one file at a time. daisy-player crashes sometimes on these cards. From this version on the pulseaudio sound-driver will be used instead. The pulseaudio sound system has no problems with these cards.
-
-I don't know how to play with pulseaudio in the C function sox_open_write (). For now, the external command sox will be used instead.
-
+                 
 When playing an Audio-CD skip-left and skip-right react a little late. The same for commands like 'U', 'D' and HOME.
 
 THANKS TO
-Daniel Veillard <daniel@veillard.com>  for the XML2 library.
+Daniel Veillard <daniel@veillard.com>
+Rob Sykes <aquegg@yahoo.co.uk>  for the XML2 library.
 
 Robert Leslie <rob@mars.org>  for the MPEG audio decoder (madplay).
 
@@ -84,7 +82,7 @@ FILES
 ~/.daisy-player.xml  This file, in XML-format, contains the name of the desired audio device and the desired playing speed.
 
 SEE ALSO
-cddbget(1), unar(1), eject(1), udisksctl(1), sox(1), pulseaudio(1)
+cddbget(1), unar(1), eject(1), udisksctl(1), pulseaudio(1)
 AUTHOR
 Jos Lemmens <jos@jlemmens.nl>
 COPYRIGHT
diff --git a/man/Makefile.in b/man/Makefile.in
index 080f0e0..df5c880 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -310,9 +310,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu man/Makefile
+	  $(AUTOMAKE) --foreign man/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/man/daisy-player.1 b/man/daisy-player.1
index 614d09c..4e19a1a 100644
--- a/man/daisy-player.1
+++ b/man/daisy-player.1
@@ -1,5 +1,5 @@
 .\" Text automatically generated by txt2man
-.TH daisy-player 1 "16 February 2018" "11.3.2" "Linux Reference Manual"
+.TH daisy-player 1 "10 March 2018" "11.4" "Linux Reference Manual"
 .SH NAME
 \fBdaisy-player \fP- player for DAISY Digital Talking Books or Audio-CD's
 \fB
@@ -179,15 +179,13 @@ increase playback volume (beware of Clipping)
 v,1
 decrease playback volume
 .SH NOTES
-On some soundcards (especially onboard cards) the alsa driver only can play one file at a time. \fBdaisy-player\fP crashes sometimes on these cards. From this version on the pulseaudio sound-driver will be used instead. The pulseaudio sound system has no problems with these cards.
-.PP
-I don't know how to play with pulseaudio in the C function sox_open_write (). For now, the external command sox will be used instead.
-.PP
+
 When playing an Audio-CD skip-left and skip-right react a little late. The same for commands like 'U', 'D' and HOME.
 .SH THANKS TO
+Daniel Veillard <daniel@veillard.com>
 .TP
 .B
-Daniel Veillard <daniel@veillard.com>
+Rob Sykes <aquegg@yahoo.co.uk>
 for the XML2 library.
 .TP
 .B
@@ -209,7 +207,7 @@ This directory contains the bookmarks in XML-format. . Each file has the name of
 ~/.daisy-player.xml
 This file, in XML-format, contains the name of the desired audio device and the desired playing speed.
 .SH SEE ALSO
-\fBcddbget\fP(1), \fBunar\fP(1), \fBeject\fP(1), \fBudisksctl\fP(1), \fBsox\fP(1), \fBpulseaudio\fP(1)
+\fBcddbget\fP(1), \fBunar\fP(1), \fBeject\fP(1), \fBudisksctl\fP(1), \fBpulseaudio\fP(1)
 .SH AUTHOR
 Jos Lemmens <jos@jlemmens.nl>
 .SH COPYRIGHT
diff --git a/po/fr.gmo b/po/fr.gmo
index 4c0105c..a8e7acb 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index 94801ce..e98c98a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,6 +1,6 @@
 # message catalog file for daisy-player - French version
 #
-# Copyright (C) 2003-2017 J. Lemmens
+# Copyright (C) 2003-2018 J. Lemmens
 #
 # 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
@@ -16,16 +16,15 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# translated by Osvaldo La Rosa <yellowpenguin@telenet.be>
-# some lines are translated with "trans -b en:fr"
+# translated by ervmsjvrzw <aarqdb@fruimd.com>
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.2\n"
 "Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n"
 "POT-Creation-Date: 2018-01-27 17:13+0100\n"
-"PO-Revision-Date: 2017-07-21 15:06+0200\n"
-"Last-Translator: Osvaldo La Rosa <yellowpenguin@telenet.be>\n"
-"Language-Team: Osvaldo La Rosa <yellowpenguin@telenet.be>\n"
+"PO-Revision-Date: 2018-03-03 15:06+0200\n"
+"Last-Translator: \n"
+"Language-Team: \n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,15 +51,15 @@ msgstr "Je ne sais pas lire le type: %d"
 
 #: src/common.c:995
 msgid "Go to page number:"
-msgstr "Aller à la page numéro:"
+msgstr "Aller à la page numéro:"
 
 #: src/common.c:1013
 msgid "Please wait..."
-msgstr "S'il vous plaît, attendez..."
+msgstr "S'il vous plaît, attendez..."
 
 #: src/common.c:1072
 msgid "Select a soundcard:"
-msgstr "Sélectionnez une carte son:"
+msgstr "Sélectionnez une carte son:"
 
 #: src/common.c:1074
 msgid "Cannot read /proc/asound/cards"
@@ -72,11 +71,11 @@ msgstr "Ce livre ne contient pas de piste audio. Lire avec eBook-speaker"
 
 #: src/daisy3.c:1068
 msgid "No items found. Try option \"-N\"."
-msgstr "Aucun élément trouvé.  Essayez l'option \"-N\"."
+msgstr "Aucun élément trouvé.  Essayez l'option \"-N\"."
 
 #: src/daisy3.c:1209
 msgid "No items found. Try option \"-O\"."
-msgstr "Aucun élément trouvé.  Essayez l'option \"-O\"."
+msgstr "Aucun élément trouvé.  Essayez l'option \"-O\"."
 
 #: src/daisy-player.c:312
 msgid "'h' for help -"
@@ -95,7 +94,7 @@ msgstr "niveau: %d de %d"
 #: src/daisy-player.c:329
 #, c-format
 msgid "total length: %02d:%02d:%02d"
-msgstr "durée totale: %02d:%02d:%02d"
+msgstr "durée totale: %02d:%02d:%02d"
 
 #: src/daisy-player.c:627
 msgid "These commands are available in this version:"
@@ -103,19 +102,19 @@ msgstr "Ces commandes sont disponibles dans cette version:"
 
 #: src/daisy-player.c:631
 msgid "cursor down,2   - move cursor to the next item"
-msgstr "curseur bas,2    - déplacer le curseur vers l'élément suivant"
+msgstr "curseur bas,2    - déplacer le curseur vers l'élément suivant"
 
 #: src/daisy-player.c:633
 msgid "cursor up,8     - move cursor to the previous item"
-msgstr "curseur haut,8   - déplacer le curseur vers l'élément précédent"
+msgstr "curseur haut,8   - déplacer le curseur vers l'élément précédent"
 
 #: src/daisy-player.c:635
 msgid "cursor right,6  - skip to next phrase"
-msgstr "curseur droit,6  - aller à la phrase suivante"
+msgstr "curseur droit,6  - aller à la phrase suivante"
 
 #: src/daisy-player.c:637
 msgid "cursor left,4   - skip to previous phrase"
-msgstr "curseur gauche,4 - revenir à la phrase précédente"
+msgstr "curseur gauche,4 - revenir à la phrase précédente"
 
 #: src/daisy-player.c:639
 msgid "page-down,3     - view next page"
@@ -123,110 +122,109 @@ msgstr "page bas,3       - afficher la page suivante"
 
 #: src/daisy-player.c:641
 msgid "page-up,9       - view previous page"
-msgstr "page haut,9      - afficher la page précédente"
+msgstr "page haut,9      - afficher la page précédente"
 
 #: src/daisy-player.c:643
 msgid "enter           - start playing"
-msgstr "enter            - lancer l'écoute"
+msgstr "enter            - lancer l'écoute"
 
 #: src/daisy-player.c:645
 msgid "space,0         - pause/resume playing"
-msgstr "espace,0         - pause/poursuivre l'écoute"
+msgstr "espace,0         - pause/poursuivre l'écoute"
 
 #: src/daisy-player.c:647
 msgid "home,*          - play on normal speed"
-msgstr "home,*           - écouter à la vitesse normale"
+msgstr "home,*           - écouter à la vitesse normale"
 
 #: src/daisy-player.c:649
 msgid "Press any key for next page..."
-msgstr "Appuyez sur une touche pour aller à la page suivante..."
+msgstr "Appuyez sur une touche pour aller à la page suivante..."
 
 #: src/daisy-player.c:655
 msgid "/               - search for a label"
-msgstr "/              - chercher un label"
+msgstr "/      - chercher un label"
 
 #: src/daisy-player.c:657
 msgid "d               - store current item to disk"
-msgstr "d              - sauvegarder l'élément courant sur disque dur"
+msgstr "d      - sauvegarder l'élément courant sur disque dur"
 
 #: src/daisy-player.c:659
 msgid "D,-             - decrease playing speed"
-msgstr "D,-            - réduire la vitesse d'écoute"
+msgstr "D,-    - réduire la vitesse d'écoute"
 
 #: src/daisy-player.c:661
 msgid "e,.             - quit daisy-player, place a bookmark and eject"
-msgstr "e,.            - quitter daisy-player, placer un marqueur et éjecter"
+msgstr "e,.    - quitter daisy-player, placer un marqueur et éjecter"
 
 #: src/daisy-player.c:663
 msgid ""
 "f               - find the currently playing item and place the cursor there"
 msgstr ""
-"f              - trouver l'élément en cours de diffusion et y placer le "
-"curseur"
+"f      - trouver l'élément en cours de diffusion et y placer le curseur"
 
 #: src/daisy-player.c:666
 msgid "g               - go to time in this song (MM:SS)"
-msgstr "g              - aller au temps (MM:SS) dans le morceau"
+msgstr "g      - aller au temps (MM:SS) dans le morceau"
 
 #: src/daisy-player.c:669
 msgid "g               - go to time in this item (MM:SS)"
-msgstr "g              - aller au temps (MM:SS) dans cet élément"
+msgstr "g      - aller au temps (MM:SS) dans cet élément"
 
 #: src/daisy-player.c:672
 msgid "G               - go to page number"
-msgstr "G              - aller à la page numéro"
+msgstr "G      - aller à la page numéro"
 
 #: src/daisy-player.c:674
 msgid "h,?             - give this help"
-msgstr "h,?            - afficher cette page d'aide"
+msgstr "h,?    - afficher cette page d'aide"
 
 #: src/daisy-player.c:676
 msgid "j,5             - just play current item"
-msgstr "j,5            - écouter uniquement l'élément courant"
+msgstr "j,5    - écouter uniquement l'élément courant"
 
 #: src/daisy-player.c:678
 msgid "l               - switch to next level"
-msgstr "l              - aller au niveau suivant"
+msgstr "l      - aller au niveau suivant"
 
 #: src/daisy-player.c:680
 msgid "L               - switch to previous level"
-msgstr "L              - remonter au niveau précédent"
+msgstr "L      - remonter au niveau précédent"
 
 #: src/daisy-player.c:682
 msgid "n               - search forwards"
-msgstr "n              - rechercher plus loin"
+msgstr "n      - rechercher plus loin"
 
 #: src/daisy-player.c:684
 msgid "N               - search backwards"
-msgstr "N              - rechercher avant"
+msgstr "N      - rechercher avant"
 
 #: src/daisy-player.c:686
 msgid "o               - select next output sound device"
-msgstr "o              - sélectionner la carte son suivante"
+msgstr "o      - sélectionner la carte son suivante"
 
 #: src/daisy-player.c:688
 msgid "p               - place a bookmark"
-msgstr "p              - placer un marqueur"
+msgstr "p      - placer un marqueur"
 
 #: src/daisy-player.c:690
 msgid "q               - quit daisy-player and place a bookmark"
-msgstr "q              - quitter daisy-player et placer un marqueur"
+msgstr "q      - quitter daisy-player et placer un marqueur"
 
 #: src/daisy-player.c:692
 msgid "s               - stop playing"
-msgstr "s              - arrêter l'écoute"
+msgstr "s      - arrêter l'écoute"
 
 #: src/daisy-player.c:694
 msgid "U,+             - increase playing speed"
-msgstr "U,+            - accélérer la vitesse d'écoute"
+msgstr "U,+    - accélérer la vitesse d'écoute"
 
 #: src/daisy-player.c:696
 msgid "v,1             - decrease playback volume"
-msgstr "v,1            - baisser le volume d'écoute"
+msgstr "v,1    - baisser le volume d'écoute"
 
 #: src/daisy-player.c:698
 msgid "V,7             - increase playback volume (beware of Clipping)"
-msgstr "V,7            - remonter le volume d'écoute"
+msgstr "V,7    - remonter le volume d'écoute"
 
 #: src/daisy-player.c:700
 msgid "Press any key to leave help..."
@@ -254,12 +252,12 @@ msgstr "Daisy-player - Version %s %s"
 #, c-format
 msgid "Usage: %s [directory_with_a_Daisy-structure] | [Daisy_book_archive]"
 msgstr ""
-"Utilisation: %s [-l langue] [répertoire avec structure Daisy] | [archive "
+"Utilisation: %s [-l langue] [répertoire avec structure Daisy] | [archive "
 "livre Daisy]"
 
 #: src/daisy-player.c:1653
 msgid "[-c cdrom_device] [-d pulseaudio_sound_device]"
-msgstr "[-c unité de lecture cdrom] [-d unité de son pulseaudio]"
+msgstr "[-c unité de lecture cdrom] [-d unité de son pulseaudio]"
 
 #: src/daisy-player.c:1666
 msgid "Cannot read /proc/mounts."
@@ -267,15 +265,15 @@ msgstr "Je ne sais pas lire /proc/mounts."
 
 #: src/daisy-player.c:1886
 msgid "A parser to play Daisy CD's with Linux"
-msgstr "Une application pour écouter des CD's Daisy sous Linux"
+msgstr "Une application pour écouter des CD's Daisy sous Linux"
 
 #: src/daisy-player.c:1888
 msgid "Scanning for a Daisy CD..."
-msgstr "Détection d'un CD Daisy..."
+msgstr "Détection d'un CD Daisy..."
 
 #: src/daisy-player.c:1986 src/daisy-player.c:2116
 msgid "No DAISY-CD or Audio-cd found"
-msgstr "Pas de CD Daisy ou audio détecté..."
+msgstr "Pas de CD Daisy ou audio détecté..."
 
 #: src/daisy-player.c:2043 src/daisy-player.c:2055 src/daisy-player.c:2083
 msgid "No Daisy CD in drive."
@@ -283,7 +281,7 @@ msgstr "Pas de CD Daisy dans le lecteur."
 
 #: src/daisy-player.c:2099
 msgid "Found an Audio-CD."
-msgstr "CD audio détecté."
+msgstr "CD audio détecté."
 
 #: src/daisy-player.c:2101
 msgid "Get titles from freedb.freedb.org..."
@@ -297,6 +295,3 @@ msgstr "Daisy-player - Version %s - (C)2018 J. Lemmens"
 #: src/daisy-player.c:2243
 msgid "Press 'h' for help"
 msgstr "Appuyez sur 'h' pour obtenir de l'aide"
-
-#~ msgid "eBook-speaker cannot handle this file."
-#~ msgstr "L'eBook-Speaker ne peut pas gérer ce fichier."
diff --git a/po/pl.gmo b/po/pl.gmo
index c060627..48d23c7 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index cd2cf39..c691278 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,6 +1,6 @@
 # message catalog file for daisy-player - Polish version
 #
-# Copyright (C) 2003-2015 J. Lemmens
+# Copyright (C) 2003-2018 J. Lemmens
 #
 # 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
@@ -16,20 +16,19 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# translated by Patryk Doering <http://www.rekinet.pl>
-# some lines are translated with "trans -b en:pl"
+# translated by Barneyxcq <jimosa4xf2@hotmail.com>
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.2\n"
 "Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n"
 "POT-Creation-Date: 2018-01-27 17:13+0100\n"
-"PO-Revision-Date: 2013-01-29 15:06+0200\n"
-"Last-Translator: Patryk Doering <http://www.rekinet.pl>\n"
-"Language-Team: Patryk Doering <http://www.rekinet.pl>Language: pl\n"
+"PO-Revision-Date: 2018-02-17 11:06+0200\n"
+"Last-Translator: Barneyxcq <jimosa4xf2@hotmail.com>\n"
+"Language-Team: Barneyxcq <jimosa4xf2@hotmail.com>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 16bit\n"
 
 #: src/common.c:230 src/common.c:306 src/daisy2.02.c:45 src/daisy2.02.c:200
 #: src/daisy3.c:156 src/daisy3.c:225 src/daisy3.c:322 src/daisy3.c:402
@@ -39,48 +38,48 @@ msgstr ""
 #: src/daisy-player.c:2157
 #, c-format
 msgid "Cannot read %s"
-msgstr "Nie można odczytać %s"
+msgstr "Nie można odczytać %s"
 
 #: src/common.c:587
 msgid "Please try to play this book with daisy-player"
-msgstr "Staraj się zagrać w tę książkę z daisy-player"
+msgstr "Staraj się zagrać w tę książkę z daisy-player"
 
 #: src/common.c:917
 #, c-format
 msgid "Cannot read type: %d"
-msgstr "Nie można odczytać typ: %d"
+msgstr "Nie można odczytać typ: %d"
 
 #: src/common.c:995
 msgid "Go to page number:"
-msgstr "Idź do strony numer:"
+msgstr "Idź do strony numer:"
 
 #: src/common.c:1013
 msgid "Please wait..."
-msgstr "Proszę czekać..."
+msgstr "Proszę czekać..."
 
 #: src/common.c:1072
 msgid "Select a soundcard:"
-msgstr "Wybierz kartę dźwiękową:"
+msgstr "Wybierz kartę dźwiękową:"
 
 #: src/common.c:1074
 msgid "Cannot read /proc/asound/cards"
-msgstr "Nie można odczytać /proc/asound/cards "
+msgstr "Nie można odczytać /proc/asound/cards"
 
 #: src/daisy3.c:1052 src/daisy-player.c:827 src/daisy-player.c:1201
 msgid "This book has no audio. Play this book with eBook-speaker"
-msgstr "Ta książka nie ma dźwięku.  Zagraj w tę książkę z eBook-speakerem"
+msgstr "Ta książka nie ma dźwięku.  Zagraj w tę książkę z eBook-speakerem"
 
 #: src/daisy3.c:1068
 msgid "No items found. Try option \"-N\"."
-msgstr "Nie znaleziono żadnych produktów.  Spróbuj opcji \"-N\"."
+msgstr "Nie znaleziono żadnych produktów.  Spróbuj opcji \"-N\"."
 
 #: src/daisy3.c:1209
 msgid "No items found. Try option \"-O\"."
-msgstr "Nie znaleziono żadnych produktów.  Spróbuj opcji \"-O\"."
+msgstr "Nie znaleziono żadnych produktów.  Spróbuj opcji \"-O\"."
 
 #: src/daisy-player.c:312
 msgid "'h' for help -"
-msgstr "'h' o pomoc - "
+msgstr "'h' o pomoc -"
 
 #: src/daisy-player.c:316
 #, c-format
@@ -97,142 +96,143 @@ msgstr "Poziom: %d z %d"
 msgid "total length: %02d:%02d:%02d"
 msgstr "Długość całkowita: %02d:%02d:%02d"
 
+# msgstr "Długość całkowita: %02d:%02d:%02d"
 #: src/daisy-player.c:627
 msgid "These commands are available in this version:"
-msgstr "Te polecenia są dostępne w tej wersji:"
+msgstr "Te polecenia są dostępne w tej wersji:"
 
 #: src/daisy-player.c:631
 msgid "cursor down,2   - move cursor to the next item"
-msgstr "Kursor w dół,2   - przesuń kursor do następnego elementu"
+msgstr "Kursor w dół,2   - przesuń kursor do następnego elementu"
 
 #: src/daisy-player.c:633
 msgid "cursor up,8     - move cursor to the previous item"
-msgstr "Kursor w górę,8  - przesuń kursor do poprzedniej pozycji"
+msgstr "Kursor w górę,8  - przesuń kursor do poprzedniej pozycji"
 
 #: src/daisy-player.c:635
 msgid "cursor right,6  - skip to next phrase"
-msgstr "Kursor w prawo,6 - przejście do następnej frazy"
+msgstr "Kursor w prawo,6   - przejście do następnej frazy"
 
 #: src/daisy-player.c:637
 msgid "cursor left,4   - skip to previous phrase"
-msgstr "Kursor w lewo,4  - przejście do poprzedniej frazy"
+msgstr "Kursor w lewo,4    - przejście do poprzedniej frazy"
 
 #: src/daisy-player.c:639
 msgid "page-down,3     - view next page"
-msgstr "page-down,3      - zobacz następną stronę"
+msgstr "page-down,3        - zobacz następną stronę"
 
 #: src/daisy-player.c:641
 msgid "page-up,9       - view previous page"
-msgstr "page-up,9        - zobacz poprzednią stronę"
+msgstr "page-up,9          - zobacz poprzednią stronę"
 
 #: src/daisy-player.c:643
 msgid "enter           - start playing"
-msgstr "Enter            - rozpoczęcie odtwarzania "
+msgstr "Enter              - rozpoczęcie odtwarzania"
 
 #: src/daisy-player.c:645
 msgid "space,0         - pause/resume playing"
-msgstr "Space,0          - zatrzymanie odtwarzania "
+msgstr "Space,0            - zatrzymanie odtwarzania"
 
 #: src/daisy-player.c:647
 msgid "home,*          - play on normal speed"
-msgstr "Home,*           - odtwarzanie na standardowej prędkości "
+msgstr "Home,*             - odtwarzanie na standardowej prędkości"
 
 #: src/daisy-player.c:649
 msgid "Press any key for next page..."
-msgstr "Naciśnij dowolny klawisz na następnej stronie..."
+msgstr "Naciśnij dowolny klawisz na następnej stronie..."
 
 #: src/daisy-player.c:655
 msgid "/               - search for a label"
-msgstr "/          - sprawdź etykietę "
+msgstr "/          - sprawdź etykietę"
 
 #: src/daisy-player.c:657
 msgid "d               - store current item to disk"
-msgstr "d          - zapisz aktualną pozycję na dysku "
+msgstr "d          - zapisz aktualną pozycję na dysku"
 
 #: src/daisy-player.c:659
 msgid "D,-             - decrease playing speed"
-msgstr "D,-        - zmniejszenie prędkości odtwarzania "
+msgstr "D,-        - zmniejszenie prędkości odtwarzania"
 
 #: src/daisy-player.c:661
 msgid "e,.             - quit daisy-player, place a bookmark and eject"
-msgstr "e,.        - zamknij daisy-player, umieść zakładkę i wysunąć"
+msgstr "e,.        - zamknij daisy-player, umieść zakładkę i wysunąć"
 
 #: src/daisy-player.c:663
 msgid ""
 "f               - find the currently playing item and place the cursor there"
-msgstr "f          - znajdź element aktualnie odtwarzany i umieść tam kursor "
+msgstr "f          - znajdź element aktualnie odtwarzany i umieść tam kursor"
 
 #: src/daisy-player.c:666
 msgid "g               - go to time in this song (MM:SS)"
-msgstr "g          - idź do czasu odtwarzania tej pozycji (mm:ss) "
+msgstr "g          - idź do czasu odtwarzania tej pozycji (mm:ss)"
 
 #: src/daisy-player.c:669
 msgid "g               - go to time in this item (MM:SS)"
-msgstr "g          - idź do czasu odtwarzania tej pozycji (mm:ss) "
+msgstr "g          - idź do czasu odtwarzania tej pozycji (mm:ss)"
 
 #: src/daisy-player.c:672
 msgid "G               - go to page number"
-msgstr "G          - przejdź do strony numer (jeśli jest) "
+msgstr "G          - przejdź do strony numer (jeśli jest)"
 
 #: src/daisy-player.c:674
 msgid "h,?             - give this help"
-msgstr "h,?        - pomoc "
+msgstr "h,?        - pomoc"
 
 #: src/daisy-player.c:676
 msgid "j,5             - just play current item"
-msgstr "j,5        - po prostu odtwarza aktualną pozycję "
+msgstr "j,5        - po prostu odtwarza aktualną pozycję"
 
 #: src/daisy-player.c:678
 msgid "l               - switch to next level"
-msgstr "l          - przejście do następnego poziomu "
+msgstr "l          - przejście do następnego poziomu"
 
 #: src/daisy-player.c:680
 msgid "L               - switch to previous level"
-msgstr "l          - przejście do poprzedniego poziomu "
+msgstr "l          - przejście do poprzedniego poziomu"
 
 #: src/daisy-player.c:682
 msgid "n               - search forwards"
-msgstr "n          - wyszukiwanie w przód "
+msgstr "n          - wyszukiwanie w przód"
 
 #: src/daisy-player.c:684
 msgid "N               - search backwards"
-msgstr "n          - wyszukiwanie do tyłu "
+msgstr "n          - wyszukiwanie do tyłu"
 
 #: src/daisy-player.c:686
 msgid "o               - select next output sound device"
-msgstr "o          - wybierz wyjściowe urządzenie dźwiękowe "
+msgstr "o          - wybierz wyjściowe urządzenie dźwiękowe"
 
 #: src/daisy-player.c:688
 msgid "p               - place a bookmark"
-msgstr "p          - umieść zakładkę "
+msgstr "p          - umieść zakładkę"
 
 #: src/daisy-player.c:690
 msgid "q               - quit daisy-player and place a bookmark"
-msgstr "q          - wyjście z daisy-playera i umieszczenie zakładki "
+msgstr "q          - wyjście z daisy-playera i umieszczenie zakładki"
 
 #: src/daisy-player.c:692
 msgid "s               - stop playing"
-msgstr "s          - zatrzymanie odtwarzania "
+msgstr "s          - zatrzymanie odtwarzania"
 
 #: src/daisy-player.c:694
 msgid "U,+             - increase playing speed"
-msgstr "U,+        - zwiększenie prędkości odtwarzania "
+msgstr "U,+        - zwiększenie prędkości odtwarzania"
 
 #: src/daisy-player.c:696
 msgid "v,1             - decrease playback volume"
-msgstr "V,1        - zmniejszenie głośności odtwarzania"
+msgstr "V,1        - zmniejszenie głośności odtwarzania"
 
 #: src/daisy-player.c:698
 msgid "V,7             - increase playback volume (beware of Clipping)"
-msgstr "V,7        - zwiększaj głośność odtwarzania (uważaj na przycinanie)"
+msgstr "V,7        - zwiększaj głośność odtwarzania (uważaj na przycinanie)"
 
 #: src/daisy-player.c:700
 msgid "Press any key to leave help..."
-msgstr "Naciśnij dowolny klawisz, aby opuścić pomoc... "
+msgstr "Naciśnij dowolny klawisz, aby opuścić pomoc..."
 
 #: src/daisy-player.c:846
 msgid "Please wait... -------------------------"
-msgstr "Proszę czekać... ------------------------- "
+msgstr "Proszę czekać... -------------------------"
 
 #: src/daisy-player.c:951
 msgid "What do you search?"
@@ -240,7 +240,7 @@ msgstr "Czego szukasz?"
 
 #: src/daisy-player.c:1053
 msgid "Go to time (MM:SS):"
-msgstr "Idź do czasu (mm:ss):"
+msgstr "Idź do czasu (mm:ss):"
 
 #: src/daisy-player.c:1648 src/daisy-player.c:1884 src/daisy-player.c:1902
 #: src/daisy-player.c:2006 src/daisy-player.c:2022
@@ -251,7 +251,7 @@ msgstr "Daisy-player - Wersja %s %s"
 #: src/daisy-player.c:1651
 #, c-format
 msgid "Usage: %s [directory_with_a_Daisy-structure] | [Daisy_book_archive]"
-msgstr "Użycie: %s [directory_with_a_Daisy-structure] | [Daisy_book_archive]"
+msgstr "Użycie: %s [directory_with_a_Daisy-structure] | [Daisy_book_archive]"
 
 #: src/daisy-player.c:1653
 msgid "[-c cdrom_device] [-d pulseaudio_sound_device]"
@@ -259,7 +259,7 @@ msgstr "[-c cdrom_device] [-d pulseaudio_sound_device]"
 
 #: src/daisy-player.c:1666
 msgid "Cannot read /proc/mounts."
-msgstr "Nie można odczytać /proc/mounts. "
+msgstr "Nie można odczytać /proc/mounts."
 
 #: src/daisy-player.c:1886
 msgid "A parser to play Daisy CD's with Linux"
@@ -267,15 +267,15 @@ msgstr "Parser odtwarza z Daisy CD's i Linuksem"
 
 #: src/daisy-player.c:1888
 msgid "Scanning for a Daisy CD..."
-msgstr "Skanowanie Daisy CD... "
+msgstr "Skanowanie Daisy CD..."
 
 #: src/daisy-player.c:1986 src/daisy-player.c:2116
 msgid "No DAISY-CD or Audio-cd found"
-msgstr "To nie jest Daisy-CD ani Audio-CD. "
+msgstr "To nie jest Daisy-CD ani Audio-CD."
 
 #: src/daisy-player.c:2043 src/daisy-player.c:2055 src/daisy-player.c:2083
 msgid "No Daisy CD in drive."
-msgstr "W napędzie nie ma Daisy-CD. "
+msgstr "W napędzie nie ma Daisy-CD."
 
 #: src/daisy-player.c:2099
 msgid "Found an Audio-CD."
@@ -283,7 +283,7 @@ msgstr "Znaleziono Audio-CD."
 
 #: src/daisy-player.c:2101
 msgid "Get titles from freedb.freedb.org..."
-msgstr "Pobierz tytuły z freedb.freedb.org... "
+msgstr "Pobierz tytuły z freedb.freedb.org..."
 
 #: src/daisy-player.c:2230
 #, c-format
@@ -292,7 +292,4 @@ msgstr "Daisy-player - Wersja %s - (C)2018 J. Lemmens"
 
 #: src/daisy-player.c:2243
 msgid "Press 'h' for help"
-msgstr "Naciśnij 'h' jeśli potrzebujesz pomocy"
-
-#~ msgid "eBook-speaker cannot handle this file."
-#~ msgstr "eBook-speaker  nie może obsłużyć tego pliku."
+msgstr "Naciśnij 'h' jeśli potrzebujesz pomocy"
diff --git a/src/Makefile.am b/src/Makefile.am
index 2caae03..49050a8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,7 +20,6 @@ libtool: $(LIBTOOL_DEPS)
 	$(SHELL) ./config.status --recheck
 
 .c.s:
-	cd madplay && ./configure && make
 	$(COMPILE) -S $<
 
 again:
@@ -30,7 +29,7 @@ again:
 .PHONY: profile again
 
 daisy_player_SOURCES = daisy.h audiocd.c paranoia.c common.c daisy2.02.c \
-                       daisy3.c daisy-player.c \
+                       daisy3.c daisy-player.c playfile.c \
                        madplay/global.h madplay/madplay.c madplay/audio.c \
                        madplay/version.h madplay/audio.h \
                        madplay/crc.c madplay/version.c madplay/tag.c \
diff --git a/src/Makefile.in b/src/Makefile.in
index 69625c7..e49ceab 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -110,12 +110,13 @@ PROGRAMS = $(bin_PROGRAMS)
 am__dirstamp = $(am__leading_dot)dirstamp
 am_daisy_player_OBJECTS = audiocd.$(OBJEXT) paranoia.$(OBJEXT) \
 	common.$(OBJEXT) daisy2.02.$(OBJEXT) daisy3.$(OBJEXT) \
-	daisy-player.$(OBJEXT) madplay/madplay.$(OBJEXT) \
-	madplay/audio.$(OBJEXT) madplay/crc.$(OBJEXT) \
-	madplay/version.$(OBJEXT) madplay/tag.$(OBJEXT) \
-	madplay/player.$(OBJEXT) madplay/audio_wave.$(OBJEXT) \
-	madplay/resample.$(OBJEXT) madplay/rgain.$(OBJEXT) \
-	madplay/filter.$(OBJEXT) madplay/audio_cdda.$(OBJEXT)
+	daisy-player.$(OBJEXT) playfile.$(OBJEXT) \
+	madplay/madplay.$(OBJEXT) madplay/audio.$(OBJEXT) \
+	madplay/crc.$(OBJEXT) madplay/version.$(OBJEXT) \
+	madplay/tag.$(OBJEXT) madplay/player.$(OBJEXT) \
+	madplay/audio_wave.$(OBJEXT) madplay/resample.$(OBJEXT) \
+	madplay/rgain.$(OBJEXT) madplay/filter.$(OBJEXT) \
+	madplay/audio_cdda.$(OBJEXT)
 daisy_player_OBJECTS = $(am_daisy_player_OBJECTS)
 daisy_player_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
@@ -330,7 +331,7 @@ DEPENDENCIES = $(depend)
 LDADD = $(ldadd)
 CLEANFILES = $(EXTRA_PROGRAMS)
 daisy_player_SOURCES = daisy.h audiocd.c paranoia.c common.c daisy2.02.c \
-                       daisy3.c daisy-player.c \
+                       daisy3.c daisy-player.c playfile.c \
                        madplay/global.h madplay/madplay.c madplay/audio.c \
                        madplay/version.h madplay/audio.h \
                        madplay/crc.c madplay/version.c madplay/tag.c \
@@ -462,6 +463,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/daisy2.02.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/daisy3.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paranoia.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/playfile.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@madplay/$(DEPDIR)/audio.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@madplay/$(DEPDIR)/audio_cdda.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@madplay/$(DEPDIR)/audio_wave.Po@am__quote@
@@ -704,7 +706,6 @@ libtool: $(LIBTOOL_DEPS)
 	$(SHELL) ./config.status --recheck
 
 .c.s:
-	cd madplay && ./configure && make
 	$(COMPILE) -S $<
 
 again:
diff --git a/src/common.c b/src/common.c
index bc583bf..362be55 100644
--- a/src/common.c
+++ b/src/common.c
@@ -104,36 +104,6 @@ void failure (misc_t *misc, char *str, int e)
    _exit (-1);
 } // failure
 
-void playfile (misc_t *misc, char *in_file, char *in_type,
-               char *out_file, char *out_type, char *tempo)
-{
-   char *cmd;
-
-   fclose (stdin);
-   fclose (stdout);
-   fclose (stderr);
-#ifdef DAISY_PLAYER
-   if (strcmp (in_type, "cdda") == 0)
-   {
-      cmd = malloc (strlen (in_type) + strlen (in_file) +
-                    strlen (out_type) + strlen (out_file) + 50);
-      sprintf (cmd, "sox -t cdda -L \"%s\" -t %s \"%s\" tempo -m %s",
-               in_file, out_type, out_file, tempo);
-   }
-   else
-#endif
-   {
-      cmd = malloc (strlen (in_type) + strlen (in_file) +
-                    strlen (out_type) + strlen (out_file) + 50);
-      sprintf (cmd, "sox -t %s \"%s\" -t %s \"%s\" tempo -s %s",
-               in_type, in_file, out_type, out_file, tempo);
-   } // if
-   switch (system (cmd));
-   free (cmd);
-   unlink (in_file);
-   unlink (misc->tmp_wav);
-} // playfile
-
 void player_ended ()
 {
    wait (NULL);
@@ -600,10 +570,12 @@ daisy_t *create_daisy_struct (misc_t *misc, my_attribute_t *my_attribute)
       misc->total_items = misc->items_in_opf;
    switch (chdir (misc->daisy_mp));
 #ifdef EBOOK_SPEAKER
+/* jos
    snprintf (misc->eBook_speaker_txt, MAX_STR,
              "%s/eBook-speaker.txt", misc->daisy_mp);
    snprintf (misc->tmp_wav, MAX_STR,
              "%s/eBook-speaker.wav", misc->daisy_mp);
+jos */
 #endif
    if (misc->total_items == 0)
       misc->total_items = 1;
diff --git a/src/daisy-player.c b/src/daisy-player.c
index 9ed2e8a..1392e75 100644
--- a/src/daisy-player.c
+++ b/src/daisy-player.c
@@ -18,7 +18,7 @@
  */
 
 #include "daisy.h"
-
+          
 void put_bookmark (misc_t *misc)
 {
    xmlTextWriterPtr writer;
@@ -404,7 +404,8 @@ void start_playing (misc_t *misc, daisy_t *daisy)
    madplay (misc->current_audio_file, begin, duration, misc->tmp_wav);
    snprintf (tempo_str, 10, "%lf", misc->speed);
    misc->player_pid = setpgrp ();
-   playfile (misc, misc->tmp_wav, "wav", misc->sound_dev, "pulseaudio", tempo_str);
+   playfile (misc, misc->tmp_wav, "wav", misc->sound_dev, "pulseaudio",
+             tempo_str);
    _exit (0);
 } // start_playing
 
@@ -448,7 +449,7 @@ void open_clips_file (misc_t *misc, my_attribute_t *my_attribute,
 void write_wav (misc_t *misc, my_attribute_t *my_attribute,
                 daisy_t *daisy, char *label)
 {
-   char *out_file, *out_cdr, *complete_cdr, *cmd;
+   char *out_file, *out_cdr, *complete_cdr;
    struct passwd *pw;
    int old_playing, old_displaying, old_current, old_just_this_item;
    char begin[20], duration[20];
@@ -536,15 +537,11 @@ void write_wav (misc_t *misc, my_attribute_t *my_attribute,
          break;
       misc->current += 1;
    } // while
-   close (w);
-//   playfile (misc, complete_cdr, "cdr", out_file, "wav", "1");
-   cmd = malloc (strlen (complete_cdr) + strlen (out_file) + 50);
-   sprintf (cmd, "sox -t cdr \"%s\" -t wav \"%s\"", complete_cdr,  out_file);
-   switch (system (cmd));
+   close (w);        
+   playfile (misc, complete_cdr, "cdr", out_file, "wav", "1");
    free (out_file);
    free (out_cdr);
    free (complete_cdr);
-   free (cmd);
    misc->playing = old_playing;
    misc->displaying = old_displaying;
    misc->current= old_current;
@@ -1777,7 +1774,6 @@ void handle_discinfo (misc_t *misc, my_attribute_t *my_attribute,
 
 int main (int argc, char *argv[])
 {
-
    int opt;
    char str[MAX_STR], DISCINFO_HTML[MAX_STR], *start_wd;
    char *c_opt, *d_opt, cddb_opt;
@@ -1806,8 +1802,6 @@ int main (int argc, char *argv[])
    *misc.xmlversion = 0;
 // If option '-h' exit before load_xml ()
    make_tmp_dir (&misc);
-   if (access ("/usr/bin/sox", R_OK) != 0)
-      failure (&misc, "daisy-player needs the sox package.", errno);
    misc.sound_dev = strdup ("0");
    misc.cddb_flag = 'y';
    if (! setlocale (LC_ALL, ""))
@@ -1823,7 +1817,7 @@ int main (int argc, char *argv[])
    c_opt = d_opt = NULL;
    cddb_opt = 0;
    while ((opt = getopt (argc, argv, "c:d:hijnyON")) != -1)
-   {
+   {                                           
       switch (opt)
       {
       case 'c':
diff --git a/src/madplay/autom4te.cache/output.1 b/src/madplay/autom4te.cache/output.1
index 116efc1..5277235 100644
--- a/src/madplay/autom4te.cache/output.1
+++ b/src/madplay/autom4te.cache/output.1
@@ -5005,6 +5005,8 @@ main ()
     if (*(data + i) != *(data3 + i))
       return 14;
   close (fd);
+  free (data);
+  free (data3);
   return 0;
 }
 _ACEOF
diff --git a/src/madplay/autom4te.cache/requests b/src/madplay/autom4te.cache/requests
index 3a96fb4..46a2562 100644
--- a/src/madplay/autom4te.cache/requests
+++ b/src/madplay/autom4te.cache/requests
@@ -15,66 +15,140 @@
                         'configure.ac'
                       ],
                       {
-                        'AM_PROG_CXX_C_O' => 1,
-                        '_AM_COND_ENDIF' => 1,
-                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
-                        '_AM_COND_ELSE' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'AM_PATH_GUILE' => 1,
                         'AM_PROG_CC_C_O' => 1,
-                        'AC_CANONICAL_TARGET' => 1,
-                        'AM_XGETTEXT_OPTION' => 1,
-                        'AC_DEFINE_TRACE_LITERAL' => 1,
                         'AC_CONFIG_LINKS' => 1,
-                        'm4_include' => 1,
-                        'AM_PROG_MOC' => 1,
-                        'include' => 1,
-                        'AC_CANONICAL_HOST' => 1,
-                        'AC_SUBST' => 1,
-                        'AM_PROG_FC_C_O' => 1,
-                        'AC_LIBSOURCE' => 1,
-                        'sinclude' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
+                        'AC_FC_FREEFORM' => 1,
+                        'AM_NLS' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'AC_DEFINE_TRACE_LITERAL' => 1,
                         '_m4_warn' => 1,
-                        'AM_PROG_AR' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'm4_pattern_allow' => 1,
-                        'AC_CONFIG_SUBDIRS' => 1,
-                        'AM_POT_TOOLS' => 1,
                         'AM_PROG_LIBTOOL' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AC_CONFIG_SUBDIRS' => 1,
+                        '_AM_COND_ELSE' => 1,
+                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+                        'AC_FC_SRCEXT' => 1,
+                        'sinclude' => 1,
+                        'm4_sinclude' => 1,
+                        'AM_XGETTEXT_OPTION' => 1,
+                        'AC_CANONICAL_HOST' => 1,
                         'AC_CONFIG_LIBOBJ_DIR' => 1,
+                        '_AM_MAKEFILE_INCLUDE' => 1,
+                        'AC_SUBST_TRACE' => 1,
+                        'AM_PROG_FC_C_O' => 1,
+                        '_AM_COND_IF' => 1,
+                        'AH_OUTPUT' => 1,
+                        'AM_PROG_F77_C_O' => 1,
                         '_LT_AC_TAGCONFIG' => 1,
+                        'LT_INIT' => 1,
+                        'AC_INIT' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        'AC_CANONICAL_BUILD' => 1,
+                        'AM_PROG_AR' => 1,
+                        'AC_SUBST' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
                         'AM_SILENT_RULES' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'AC_CONFIG_FILES' => 1,
+                        '_AM_COND_ENDIF' => 1,
                         'AM_GNU_GETTEXT' => 1,
-                        'AM_MAKEFILE_INCLUDE' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'AC_FC_PP_DEFINE' => 1,
-                        'AM_PROG_F77_C_O' => 1,
                         'AM_ENABLE_MULTILIB' => 1,
-                        'AC_FC_FREEFORM' => 1,
-                        'AC_CANONICAL_BUILD' => 1,
-                        'AC_REQUIRE_AUX_FILE' => 1,
-                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-                        'AC_FC_PP_SRCEXT' => 1,
-                        'm4_sinclude' => 1,
                         'AC_CONFIG_HEADERS' => 1,
-                        'AM_NLS' => 1,
+                        'AM_PROG_MKDIR_P' => 1,
+                        'AC_LIBSOURCE' => 1,
                         'AC_CONFIG_AUX_DIR' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
+                        'AC_FC_PP_SRCEXT' => 1,
+                        'AM_MAKEFILE_INCLUDE' => 1,
+                        'include' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        'AM_POT_TOOLS' => 1,
+                        'AC_REQUIRE_AUX_FILE' => 1,
+                        'AC_CANONICAL_TARGET' => 1,
                         'AC_CANONICAL_SYSTEM' => 1,
-                        'AM_PROG_MKDIR_P' => 1,
-                        'AH_OUTPUT' => 1,
-                        'AC_SUBST_TRACE' => 1,
+                        'AM_PROG_MOC' => 1,
+                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
                         'm4_pattern_forbid' => 1,
-                        '_AM_MAKEFILE_INCLUDE' => 1,
-                        'LT_INIT' => 1,
-                        '_AM_COND_IF' => 1,
-                        'AC_INIT' => 1,
-                        'AC_CONFIG_FILES' => 1,
-                        'AC_FC_SRCEXT' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1
+                        'AC_FC_PP_DEFINE' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'm4_include' => 1,
+                        'AM_PROG_CXX_C_O' => 1,
+                        'AM_PATH_GUILE' => 1,
+                        'm4_pattern_allow' => 1
+                      }
+                    ], 'Autom4te::Request' ),
+             bless( [
+                      '1',
+                      1,
+                      [
+                        '/usr/share/autoconf'
+                      ],
+                      [
+                        '/usr/share/autoconf/autoconf/autoconf.m4f',
+                        '-',
+                        '/usr/share/aclocal-1.15/internal/ac-config-macro-dirs.m4',
+                        '/usr/share/aclocal-1.15/amversion.m4',
+                        '/usr/share/aclocal-1.15/auxdir.m4',
+                        '/usr/share/aclocal-1.15/cond.m4',
+                        '/usr/share/aclocal-1.15/depend.m4',
+                        '/usr/share/aclocal-1.15/depout.m4',
+                        '/usr/share/aclocal-1.15/init.m4',
+                        '/usr/share/aclocal-1.15/install-sh.m4',
+                        '/usr/share/aclocal-1.15/lead-dot.m4',
+                        '/usr/share/aclocal-1.15/make.m4',
+                        '/usr/share/aclocal-1.15/missing.m4',
+                        '/usr/share/aclocal-1.15/options.m4',
+                        '/usr/share/aclocal-1.15/prog-cc-c-o.m4',
+                        '/usr/share/aclocal-1.15/runlog.m4',
+                        '/usr/share/aclocal-1.15/sanity.m4',
+                        '/usr/share/aclocal-1.15/silent.m4',
+                        '/usr/share/aclocal-1.15/strip.m4',
+                        '/usr/share/aclocal-1.15/substnot.m4',
+                        '/usr/share/aclocal-1.15/tar.m4',
+                        'configure.ac'
+                      ],
+                      {
+                        '_AM_MANGLE_OPTION' => 1,
+                        'AC_CONFIG_MACRO_DIR' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        '_AM_CONFIG_MACRO_DIRS' => 1,
+                        '_AM_PROG_TAR' => 1,
+                        '_AM_PROG_CC_C_O' => 1,
+                        'AM_AUX_DIR_EXPAND' => 1,
+                        '_AM_IF_OPTION' => 1,
+                        'AM_MISSING_PROG' => 1,
+                        'AM_SET_DEPDIR' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        '_m4_warn' => 1,
+                        'AM_SUBST_NOTMAKE' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        'AM_RUN_LOG' => 1,
+                        'AU_DEFUN' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'AC_DEFUN' => 1,
+                        'AM_DEP_TRACK' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
+                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'm4_pattern_allow' => 1,
+                        'm4_include' => 1,
+                        '_AM_DEPENDENCIES' => 1,
+                        'AM_MAKE_INCLUDE' => 1,
+                        'AM_SANITY_CHECK' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        '_AM_SET_OPTION' => 1,
+                        '_AM_SET_OPTIONS' => 1,
+                        'AC_DEFUN_ONCE' => 1,
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        '_AM_AUTOCONF_VERSION' => 1,
+                        'include' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
+                        'AM_SET_LEADING_DOT' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1
                       }
                     ], 'Autom4te::Request' )
            );
diff --git a/src/madplay/configure b/src/madplay/configure
index 34a6b2d..89067e3 100755
--- a/src/madplay/configure
+++ b/src/madplay/configure
@@ -5005,6 +5005,8 @@ main ()
     if (*(data + i) != *(data3 + i))
       return 14;
   close (fd);
+  free (data);
+  free (data3);
   return 0;
 }
 _ACEOF
diff --git a/src/playfile.c b/src/playfile.c
new file mode 100644
index 0000000..bb3ab7a
--- /dev/null
+++ b/src/playfile.c
@@ -0,0 +1,124 @@
+/* playfile.c - plays the audio using the sox library.
+ *
+ * Copyright (C)2003-2018 J. Lemmens
+ *
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Thanks to Rob Sykes <aquegg@yahoo.co.uk> for this source.
+ *
+ */
+
+#include "daisy.h"
+
+typedef struct
+{
+   sox_format_t *file;
+} priv_t;
+
+static int getopts (sox_effect_t *effp, int argc, char **argv)
+{
+   priv_t *p = (priv_t *)effp->priv;
+   if (argc != 2 || !(p->file = (sox_format_t *)argv[1]) ||
+       p->file->mode != 'w')
+      return SOX_EOF;
+   return SOX_SUCCESS;
+} // getopts
+
+static int flow (sox_effect_t *effp, sox_sample_t const *ibuf,
+                 sox_sample_t *obuf, size_t *isamp, size_t *osamp)
+{
+  priv_t * p = (priv_t *)effp->priv;
+  size_t len = *isamp? sox_write(p->file, ibuf, *isamp) : 0;
+
+  if (len != *isamp)
+  {
+    lsx_fail("%s: %s", p->file->filename, p->file->sox_errstr);
+    return SOX_EOF;
+  } // if
+
+  (void) obuf, *osamp = 0;
+  return SOX_SUCCESS;
+} // flow
+
+static sox_effect_handler_t const *output_effect_fn (void)
+{
+  static sox_effect_handler_t handler =
+  {
+    "output", NULL, SOX_EFF_MCHAN, getopts, NULL, flow, NULL, NULL,
+    NULL, sizeof (priv_t)
+  };
+  return &handler;
+} // output_effect_fn
+
+void playfile (misc_t *misc, char *in_file, char *in_type,
+               char *out_file, char *out_type, char *tempo)
+{
+  static sox_format_t * in, * out; /* input and output files */
+  sox_effects_chain_t * chain;
+  sox_effect_t * e;
+  sox_signalinfo_t interm_signal;
+  char * args[10];
+
+  sox_init();
+  if ((in = sox_open_read (in_file, NULL, NULL, in_type)) == NULL)
+    failure (misc, "sox_open_read", errno);
+  if (strcasecmp (in_type, "cdda") == 0)
+    in->encoding.reverse_bytes = 0;
+  if ((out = sox_open_write (out_file, &in->signal, NULL, out_type, NULL, NULL)) == NULL)
+     failure (misc, "sox_open_write", errno);
+
+  chain = sox_create_effects_chain(&in->encoding, &out->encoding);
+  interm_signal = in->signal; /* NB: deep copy */
+
+  e = sox_create_effect(sox_find_effect("input"));
+  args[0] = (char *)in, sox_effect_options (e, 1, args);
+  sox_add_effect (chain, e, &interm_signal, &in->signal);
+  free(e);
+
+  e = sox_create_effect(sox_find_effect("tempo"));
+  if (strcasecmp (in_type, "cdda") == 0)
+    args[0] = "-m", args[1] = tempo, sox_effect_options (e, 2, args);
+  else
+    args[0] = "-s", args[1] = tempo, sox_effect_options (e, 2, args);
+  sox_add_effect (chain, e, &interm_signal, &in->signal);
+  free(e);
+
+  if (in->signal.rate != out->signal.rate) {
+    e = sox_create_effect(sox_find_effect("rate"));
+    sox_effect_options (e, 0, NULL);
+    sox_add_effect (chain, e, &interm_signal, &out->signal);
+    free(e);
+  }
+
+  if (in->signal.channels != out->signal.channels)
+  {
+    e = sox_create_effect(sox_find_effect("channels"));
+    sox_effect_options (e, 0, NULL);
+    sox_add_effect (chain, e, &interm_signal, &out->signal);
+    free(e);
+  }
+
+  e = sox_create_effect(output_effect_fn());
+  args[0] = (char *)out, sox_effect_options(e, 1, args);
+  sox_add_effect(chain, e, &interm_signal, &out->signal);
+  free(e);
+
+  sox_flow_effects(chain, NULL, NULL);
+
+  sox_delete_effects_chain(chain);
+  sox_close(out);
+  sox_close(in);
+  sox_quit();
+} // playfile